diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py index b97cccf9e4..b78a0483c8 100644 --- a/mayan/apps/common/views.py +++ b/mayan/apps/common/views.py @@ -1,15 +1,11 @@ from __future__ import absolute_import, unicode_literals -from json import dumps - from django.conf import settings from django.contrib import messages from django.contrib.contenttypes.models import ContentType -from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404 -from django.urls import reverse, reverse_lazy +from django.urls import reverse_lazy from django.utils import timezone, translation -from django.utils.http import urlencode from django.utils.translation import ugettext_lazy as _ from django.views.generic import RedirectView diff --git a/mayan/apps/converter/classes.py b/mayan/apps/converter/classes.py index cd6a99ce2b..30c94d663b 100644 --- a/mayan/apps/converter/classes.py +++ b/mayan/apps/converter/classes.py @@ -10,7 +10,6 @@ import sh from django.utils.translation import ugettext_lazy as _ -from mayan.apps.common.serialization import yaml_load from mayan.apps.mimetype.api import get_mimetype from mayan.apps.storage.settings import setting_temporary_directory from mayan.apps.storage.utils import ( diff --git a/mayan/apps/document_states/views/__init__.py b/mayan/apps/document_states/views/__init__.py index 8b13789179..e69de29bb2 100644 --- a/mayan/apps/document_states/views/__init__.py +++ b/mayan/apps/document_states/views/__init__.py @@ -1 +0,0 @@ - diff --git a/mayan/apps/document_states/views/workflow_template_state_views.py b/mayan/apps/document_states/views/workflow_template_state_views.py index a0f1e3cec7..ab846c15b2 100644 --- a/mayan/apps/document_states/views/workflow_template_state_views.py +++ b/mayan/apps/document_states/views/workflow_template_state_views.py @@ -1,53 +1,30 @@ from __future__ import absolute_import, unicode_literals -from django.contrib import messages -from django.db import transaction from django.http import Http404, HttpResponseRedirect from django.shortcuts import get_object_or_404 from django.template import RequestContext -from django.urls import reverse, reverse_lazy +from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from mayan.apps.common.generics import ( - AddRemoveView, ConfirmView, FormView, SingleObjectCreateView, - SingleObjectDeleteView, SingleObjectDetailView, + FormView, SingleObjectCreateView, SingleObjectDeleteView, SingleObjectDynamicFormCreateView, SingleObjectDynamicFormEditView, SingleObjectEditView, SingleObjectListView ) from mayan.apps.common.mixins import ExternalObjectMixin -from mayan.apps.documents.events import event_document_type_edited -from mayan.apps.documents.models import DocumentType -from mayan.apps.documents.permissions import permission_document_type_edit -from mayan.apps.events.classes import EventType -from mayan.apps.events.models import StoredEventType from ..classes import WorkflowAction -from ..events import event_workflow_edited from ..forms import ( - WorkflowActionSelectionForm, WorkflowForm, WorkflowPreviewForm, - WorkflowStateActionDynamicForm, WorkflowStateForm, WorkflowTransitionForm, - WorkflowTransitionTriggerEventRelationshipFormSet -) -from ..icons import ( - icon_workflow_template_list, icon_workflow_state, icon_workflow_state_action, - icon_workflow_transition, icon_workflow_transition_field + WorkflowActionSelectionForm, WorkflowStateActionDynamicForm, + WorkflowStateForm ) +from ..icons import icon_workflow_state, icon_workflow_state_action from ..links import ( - link_workflow_template_create, link_workflow_template_state_create, + link_workflow_template_state_create, link_workflow_template_state_action_selection, - link_workflow_template_transition_create, - link_workflow_template_transition_field_create, ) -from ..models import ( - Workflow, WorkflowState, WorkflowStateAction, WorkflowTransition, - WorkflowTransitionField -) -from ..permissions import ( - permission_workflow_create, permission_workflow_delete, - permission_workflow_edit, permission_workflow_tools, - permission_workflow_view, -) -from ..tasks import task_launch_all_workflows +from ..models import Workflow, WorkflowState, WorkflowStateAction +from ..permissions import permission_workflow_edit, permission_workflow_view class WorkflowTemplateStateActionCreateView(SingleObjectDynamicFormCreateView): diff --git a/mayan/apps/document_states/views/workflow_template_transition_views.py b/mayan/apps/document_states/views/workflow_template_transition_views.py index e56a10a625..f33444751e 100644 --- a/mayan/apps/document_states/views/workflow_template_transition_views.py +++ b/mayan/apps/document_states/views/workflow_template_transition_views.py @@ -1,53 +1,28 @@ from __future__ import absolute_import, unicode_literals from django.contrib import messages -from django.db import transaction -from django.http import Http404, HttpResponseRedirect -from django.shortcuts import get_object_or_404 from django.template import RequestContext -from django.urls import reverse, reverse_lazy +from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from mayan.apps.common.generics import ( - AddRemoveView, ConfirmView, FormView, SingleObjectCreateView, - SingleObjectDeleteView, SingleObjectDetailView, - SingleObjectDynamicFormCreateView, SingleObjectDynamicFormEditView, + FormView, SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView ) from mayan.apps.common.mixins import ExternalObjectMixin -from mayan.apps.documents.events import event_document_type_edited -from mayan.apps.documents.models import DocumentType -from mayan.apps.documents.permissions import permission_document_type_edit from mayan.apps.events.classes import EventType from mayan.apps.events.models import StoredEventType -from ..classes import WorkflowAction -from ..events import event_workflow_edited from ..forms import ( - WorkflowActionSelectionForm, WorkflowForm, WorkflowPreviewForm, - WorkflowStateActionDynamicForm, WorkflowStateForm, WorkflowTransitionForm, - WorkflowTransitionTriggerEventRelationshipFormSet -) -from ..icons import ( - icon_workflow_template_list, icon_workflow_state, icon_workflow_state_action, - icon_workflow_transition, icon_workflow_transition_field + WorkflowTransitionForm, WorkflowTransitionTriggerEventRelationshipFormSet ) +from ..icons import icon_workflow_transition, icon_workflow_transition_field from ..links import ( - link_workflow_template_create, link_workflow_template_state_create, - link_workflow_template_state_action_selection, link_workflow_template_transition_create, link_workflow_template_transition_field_create, ) -from ..models import ( - Workflow, WorkflowState, WorkflowStateAction, WorkflowTransition, - WorkflowTransitionField -) -from ..permissions import ( - permission_workflow_create, permission_workflow_delete, - permission_workflow_edit, permission_workflow_tools, - permission_workflow_view, -) -from ..tasks import task_launch_all_workflows +from ..models import Workflow, WorkflowTransition, WorkflowTransitionField +from ..permissions import permission_workflow_edit, permission_workflow_view class WorkflowTemplateTransitionCreateView(ExternalObjectMixin, SingleObjectCreateView): diff --git a/mayan/apps/document_states/views/workflow_template_views.py b/mayan/apps/document_states/views/workflow_template_views.py index e755f42e33..71f61245d9 100644 --- a/mayan/apps/document_states/views/workflow_template_views.py +++ b/mayan/apps/document_states/views/workflow_template_views.py @@ -2,46 +2,23 @@ from __future__ import absolute_import, unicode_literals from django.contrib import messages from django.db import transaction -from django.http import Http404, HttpResponseRedirect -from django.shortcuts import get_object_or_404 from django.template import RequestContext -from django.urls import reverse, reverse_lazy +from django.urls import reverse_lazy from django.utils.translation import ugettext_lazy as _ from mayan.apps.common.generics import ( - AddRemoveView, ConfirmView, FormView, SingleObjectCreateView, - SingleObjectDeleteView, SingleObjectDetailView, - SingleObjectDynamicFormCreateView, SingleObjectDynamicFormEditView, - SingleObjectEditView, SingleObjectListView + AddRemoveView, ConfirmView, SingleObjectCreateView, SingleObjectDeleteView, + SingleObjectDetailView, SingleObjectEditView, SingleObjectListView ) -from mayan.apps.common.mixins import ExternalObjectMixin from mayan.apps.documents.events import event_document_type_edited from mayan.apps.documents.models import DocumentType from mayan.apps.documents.permissions import permission_document_type_edit -from mayan.apps.events.classes import EventType -from mayan.apps.events.models import StoredEventType -from ..classes import WorkflowAction from ..events import event_workflow_edited -from ..forms import ( - WorkflowActionSelectionForm, WorkflowForm, WorkflowPreviewForm, - WorkflowStateActionDynamicForm, WorkflowStateForm, WorkflowTransitionForm, - WorkflowTransitionTriggerEventRelationshipFormSet -) -from ..icons import ( - icon_workflow_template_list, icon_workflow_state, icon_workflow_state_action, - icon_workflow_transition, icon_workflow_transition_field -) -from ..links import ( - link_workflow_template_create, link_workflow_template_state_create, - link_workflow_template_state_action_selection, - link_workflow_template_transition_create, - link_workflow_template_transition_field_create, -) -from ..models import ( - Workflow, WorkflowState, WorkflowStateAction, WorkflowTransition, - WorkflowTransitionField -) +from ..forms import WorkflowForm, WorkflowPreviewForm +from ..icons import icon_workflow_template_list +from ..links import link_workflow_template_create +from ..models import Workflow from ..permissions import ( permission_workflow_create, permission_workflow_delete, permission_workflow_edit, permission_workflow_tools, diff --git a/mayan/apps/navigation/classes.py b/mayan/apps/navigation/classes.py index 73bb0488c8..78062aaf05 100644 --- a/mayan/apps/navigation/classes.py +++ b/mayan/apps/navigation/classes.py @@ -369,9 +369,6 @@ class Menu(object): for resolved_navigation_object in resolved_navigation_object_list: resolved_links = [] - # List of resolved links source links used for deduplication - resolved_links_links = [] - for bound_source, links in self.bound_links.items(): try: if inspect.isclass(bound_source): @@ -434,7 +431,6 @@ class Menu(object): } ) - resolved_links = [] # View links for link in self.bound_links.get(current_view_name, []): diff --git a/mayan/apps/platform/classes.py b/mayan/apps/platform/classes.py index f716029806..db3ab9c786 100644 --- a/mayan/apps/platform/classes.py +++ b/mayan/apps/platform/classes.py @@ -154,8 +154,8 @@ class PlatformTemplateSupervisord(PlatformTemplate): default={ 'default': { 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'mayan', 'PASSWORD':'mayanuserpass', - 'USER': 'mayan', 'HOST':'127.0.0.1' + 'NAME': 'mayan', 'PASSWORD': 'mayanuserpass', + 'USER': 'mayan', 'HOST': '127.0.0.1' } }, environment_name='MAYAN_DATABASES'