diff --git a/mayan/apps/document_comments/apps.py b/mayan/apps/document_comments/apps.py index 5689c1225d..544e4812e9 100644 --- a/mayan/apps/document_comments/apps.py +++ b/mayan/apps/document_comments/apps.py @@ -4,7 +4,9 @@ from django.apps import apps from django.utils.translation import ugettext_lazy as _ from mayan.apps.acls import ModelPermission -from mayan.apps.common import MayanAppConfig, menu_facet, menu_object, menu_sidebar +from mayan.apps.common import ( + MayanAppConfig, menu_facet, menu_object, menu_sidebar +) from mayan.apps.documents.search import document_page_search, document_search from mayan.apps.events import ModelEventType from mayan.apps.navigation import SourceColumn diff --git a/mayan/apps/document_comments/links.py b/mayan/apps/document_comments/links.py index 48f1edb461..971d956c32 100644 --- a/mayan/apps/document_comments/links.py +++ b/mayan/apps/document_comments/links.py @@ -1,4 +1,4 @@ -from __future__ import unicode_literals, absolute_import +from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ diff --git a/mayan/apps/document_comments/migrations/0001_initial.py b/mayan/apps/document_comments/migrations/0001_initial.py index cd9fd3f8c4..dac314f4ce 100644 --- a/mayan/apps/document_comments/migrations/0001_initial.py +++ b/mayan/apps/document_comments/migrations/0001_initial.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/document_comments/migrations/0002_auto_20150729_2144.py b/mayan/apps/document_comments/migrations/0002_auto_20150729_2144.py index b1f527a5ca..cd656e93a0 100644 --- a/mayan/apps/document_comments/migrations/0002_auto_20150729_2144.py +++ b/mayan/apps/document_comments/migrations/0002_auto_20150729_2144.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/document_comments/migrations/0003_auto_20150729_2144.py b/mayan/apps/document_comments/migrations/0003_auto_20150729_2144.py index ca3fe1f48c..3ed17617db 100644 --- a/mayan/apps/document_comments/migrations/0003_auto_20150729_2144.py +++ b/mayan/apps/document_comments/migrations/0003_auto_20150729_2144.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations from django.conf import settings +from django.db import migrations def migrate_old_comments(apps, schema_editor): @@ -23,7 +22,9 @@ def migrate_old_comments(apps, schema_editor): for old_comment in OldComment.objects.using(schema_editor.connection.alias).all(): comment = Comment( - document=Document.objects.using(schema_editor.connection.alias).get(pk=old_comment.object_pk), + document=Document.objects.using( + schema_editor.connection.alias + ).get(pk=old_comment.object_pk), user=User(old_comment.user.pk), comment=old_comment.comment, submit_date=old_comment.submit_date, diff --git a/mayan/apps/document_comments/migrations/0004_auto_20150920_0202.py b/mayan/apps/document_comments/migrations/0004_auto_20150920_0202.py index 25a5623a4a..771a326d5e 100644 --- a/mayan/apps/document_comments/migrations/0004_auto_20150920_0202.py +++ b/mayan/apps/document_comments/migrations/0004_auto_20150920_0202.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/document_indexing/apps.py b/mayan/apps/document_indexing/apps.py index db3a56b431..168c60f1db 100644 --- a/mayan/apps/document_indexing/apps.py +++ b/mayan/apps/document_indexing/apps.py @@ -1,37 +1,41 @@ from __future__ import absolute_import, unicode_literals -from kombu import Exchange, Queue - from django.apps import apps from django.db.models.signals import post_delete, post_save, pre_delete from django.utils.translation import ugettext_lazy as _ +from kombu import Exchange, Queue + from mayan.apps.acls import ModelPermission from mayan.apps.acls.links import link_acl_list -from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view +from mayan.apps.acls.permissions import ( + permission_acl_edit, permission_acl_view +) from mayan.apps.common import ( MayanAppConfig, menu_facet, menu_list_facet, menu_main, menu_object, menu_secondary, menu_setup, menu_tools ) from mayan.apps.common.widgets import TwoStateWidget -from mayan.apps.documents.signals import post_document_created, post_initial_document_type +from mayan.apps.documents.signals import ( + post_document_created, post_initial_document_type +) from mayan.apps.navigation import SourceColumn from mayan.celery import app from .handlers import ( create_default_document_index, handler_delete_empty, - handler_index_document, handler_remove_document, - handler_post_save_index_document + handler_index_document, handler_post_save_index_document, + handler_remove_document ) +from .licenses import * # NOQA from .links import ( link_document_index_list, link_index_main_menu, link_index_setup, - link_index_setup_create, link_index_setup_document_types, - link_index_setup_delete, link_index_setup_edit, link_index_setup_list, - link_index_setup_view, link_rebuild_index_instances, + link_index_setup_create, link_index_setup_delete, + link_index_setup_document_types, link_index_setup_edit, + link_index_setup_list, link_index_setup_view, link_rebuild_index_instances, link_template_node_create, link_template_node_delete, link_template_node_edit ) -from .licenses import * # NOQA from .permissions import ( permission_document_indexing_create, permission_document_indexing_delete, permission_document_indexing_edit, diff --git a/mayan/apps/document_indexing/links.py b/mayan/apps/document_indexing/links.py index 61a5ed9744..9427423150 100644 --- a/mayan/apps/document_indexing/links.py +++ b/mayan/apps/document_indexing/links.py @@ -2,16 +2,16 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from mayan.apps.navigation import Link, get_cascade_condition from mayan.apps.documents.icons import icon_document_type +from mayan.apps.navigation import Link, get_cascade_condition from .icons import ( icon_document_index_list, icon_index, icon_index_create, - icon_index_setup_view, icon_rebuild_index_instances, + icon_index_setup_view, icon_rebuild_index_instances ) from .permissions import ( - permission_document_indexing_create, permission_document_indexing_edit, - permission_document_indexing_delete, + permission_document_indexing_create, permission_document_indexing_delete, + permission_document_indexing_edit, permission_document_indexing_instance_view, permission_document_indexing_rebuild, permission_document_indexing_view ) diff --git a/mayan/apps/document_indexing/migrations/0001_initial.py b/mayan/apps/document_indexing/migrations/0001_initial.py index 27ab29b632..fa113ca33a 100644 --- a/mayan/apps/document_indexing/migrations/0001_initial.py +++ b/mayan/apps/document_indexing/migrations/0001_initial.py @@ -1,7 +1,7 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models + import mptt.fields diff --git a/mayan/apps/document_indexing/migrations/0002_remove_index_name.py b/mayan/apps/document_indexing/migrations/0002_remove_index_name.py index 41ad3eb87e..8c629345a0 100644 --- a/mayan/apps/document_indexing/migrations/0002_remove_index_name.py +++ b/mayan/apps/document_indexing/migrations/0002_remove_index_name.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.db import migrations diff --git a/mayan/apps/document_indexing/migrations/0003_auto_20150708_0101.py b/mayan/apps/document_indexing/migrations/0003_auto_20150708_0101.py index def52f6856..8f0119a87f 100644 --- a/mayan/apps/document_indexing/migrations/0003_auto_20150708_0101.py +++ b/mayan/apps/document_indexing/migrations/0003_auto_20150708_0101.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.db import migrations diff --git a/mayan/apps/document_indexing/migrations/0004_auto_20150708_0113.py b/mayan/apps/document_indexing/migrations/0004_auto_20150708_0113.py index 8ca92d4236..0a6f2c9e0d 100644 --- a/mayan/apps/document_indexing/migrations/0004_auto_20150708_0113.py +++ b/mayan/apps/document_indexing/migrations/0004_auto_20150708_0113.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/document_indexing/migrations/0005_index_slug.py b/mayan/apps/document_indexing/migrations/0005_index_slug.py index deb077c8ab..ea5822e147 100644 --- a/mayan/apps/document_indexing/migrations/0005_index_slug.py +++ b/mayan/apps/document_indexing/migrations/0005_index_slug.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/document_indexing/migrations/0006_auto_20150729_0144.py b/mayan/apps/document_indexing/migrations/0006_auto_20150729_0144.py index 4038af28d3..0f595b7956 100644 --- a/mayan/apps/document_indexing/migrations/0006_auto_20150729_0144.py +++ b/mayan/apps/document_indexing/migrations/0006_auto_20150729_0144.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.db import migrations diff --git a/mayan/apps/document_indexing/migrations/0007_auto_20150729_0152.py b/mayan/apps/document_indexing/migrations/0007_auto_20150729_0152.py index 160f80a8df..7c4e3d19e6 100644 --- a/mayan/apps/document_indexing/migrations/0007_auto_20150729_0152.py +++ b/mayan/apps/document_indexing/migrations/0007_auto_20150729_0152.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/document_indexing/migrations/0008_auto_20150729_1515.py b/mayan/apps/document_indexing/migrations/0008_auto_20150729_1515.py index 9ed5454422..e312b8174a 100644 --- a/mayan/apps/document_indexing/migrations/0008_auto_20150729_1515.py +++ b/mayan/apps/document_indexing/migrations/0008_auto_20150729_1515.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/document_indexing/migrations/0009_auto_20150815_0351.py b/mayan/apps/document_indexing/migrations/0009_auto_20150815_0351.py index 902e6b20b8..2b89fb45db 100644 --- a/mayan/apps/document_indexing/migrations/0009_auto_20150815_0351.py +++ b/mayan/apps/document_indexing/migrations/0009_auto_20150815_0351.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/document_indexing/migrations/0010_documentindexinstancenode_indexinstance.py b/mayan/apps/document_indexing/migrations/0010_documentindexinstancenode_indexinstance.py index e9368591fb..02a370cf45 100644 --- a/mayan/apps/document_indexing/migrations/0010_documentindexinstancenode_indexinstance.py +++ b/mayan/apps/document_indexing/migrations/0010_documentindexinstancenode_indexinstance.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.db import migrations diff --git a/mayan/apps/document_indexing/migrations/0011_auto_20170524_0456.py b/mayan/apps/document_indexing/migrations/0011_auto_20170524_0456.py index 192fa3dd8e..44f51fe695 100644 --- a/mayan/apps/document_indexing/migrations/0011_auto_20170524_0456.py +++ b/mayan/apps/document_indexing/migrations/0011_auto_20170524_0456.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.6 on 2017-05-24 04:56 from __future__ import unicode_literals from django.db import migrations, models diff --git a/mayan/apps/document_indexing/migrations/0012_auto_20170530_0728.py b/mayan/apps/document_indexing/migrations/0012_auto_20170530_0728.py index e07de36b16..95d808656c 100644 --- a/mayan/apps/document_indexing/migrations/0012_auto_20170530_0728.py +++ b/mayan/apps/document_indexing/migrations/0012_auto_20170530_0728.py @@ -1,9 +1,7 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-05-30 07:28 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): @@ -16,16 +14,28 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='index', name='slug', - field=models.SlugField(help_text='This value will be used by other apps to reference this index.', max_length=128, unique=True, verbose_name='Slug'), + field=models.SlugField( + help_text='This value will be used by other apps to ' + 'reference this index.', max_length=128, unique=True, + verbose_name='Slug' + ), ), migrations.AlterField( model_name='indexinstancenode', name='documents', - field=models.ManyToManyField(related_name='index_instance_nodes', to='documents.Document', verbose_name='Documents'), + field=models.ManyToManyField( + related_name='index_instance_nodes', to='documents.Document', + verbose_name='Documents' + ), ), migrations.AlterField( model_name='indexinstancenode', name='index_template_node', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='index_instance_nodes', to='document_indexing.IndexTemplateNode', verbose_name='Index template node'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='index_instance_nodes', + to='document_indexing.IndexTemplateNode', + verbose_name='Index template node' + ), ), ] diff --git a/mayan/apps/document_indexing/migrations/0013_auto_20170714_2133.py b/mayan/apps/document_indexing/migrations/0013_auto_20170714_2133.py index 6ccaeb6689..564e956f07 100644 --- a/mayan/apps/document_indexing/migrations/0013_auto_20170714_2133.py +++ b/mayan/apps/document_indexing/migrations/0013_auto_20170714_2133.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-07-14 21:33 from __future__ import unicode_literals from django.db import migrations @@ -14,6 +12,10 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='index', - options={'ordering': ('label',), 'verbose_name': 'Index', 'verbose_name_plural': 'Indexes'}, + options={ + 'ordering': ('label',), + 'verbose_name': 'Index', + 'verbose_name_plural': 'Indexes' + }, ), ] diff --git a/mayan/apps/document_indexing/migrations/0014_auto_20180823_2353.py b/mayan/apps/document_indexing/migrations/0014_auto_20180823_2353.py index b83a6e9aa9..a1d87a88d8 100644 --- a/mayan/apps/document_indexing/migrations/0014_auto_20180823_2353.py +++ b/mayan/apps/document_indexing/migrations/0014_auto_20180823_2353.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.11 on 2018-08-23 23:53 from __future__ import unicode_literals from django.db import migrations, models @@ -15,6 +13,10 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='indextemplatenode', name='expression', - field=models.TextField(help_text="Enter a template to render. Use Django's default templating language (https://docs.djangoproject.com/en/1.11/ref/templates/builtins/)", verbose_name='Indexing expression'), + field=models.TextField( + help_text="Enter a template to render. Use Django's default " + "templating language (https://docs.djangoproject.com/en/1.11/" + "ref/templates/builtins/)", verbose_name='Indexing expression' + ), ), ] diff --git a/mayan/apps/document_indexing/models.py b/mayan/apps/document_indexing/models.py index 308758a468..5b28c8652f 100644 --- a/mayan/apps/document_indexing/models.py +++ b/mayan/apps/document_indexing/models.py @@ -7,7 +7,8 @@ from jinja2 import Template from django.db import models, transaction from django.urls import reverse from django.utils.encoding import force_text, python_2_unicode_compatible -from django.utils.translation import ugettext, ugettext_lazy as _ +from django.utils.translation import ugettext +from django.utils.translation import ugettext_lazy as _ from mptt.fields import TreeForeignKey from mptt.models import MPTTModel @@ -19,7 +20,7 @@ from mayan.apps.lock_manager import LockError from mayan.apps.lock_manager.runtime import locking_backend from .managers import ( - DocumentIndexInstanceNodeManager, IndexManager, IndexInstanceNodeManager + DocumentIndexInstanceNodeManager, IndexInstanceNodeManager, IndexManager ) logger = logging.getLogger(__name__) diff --git a/mayan/apps/document_indexing/tests/test_models.py b/mayan/apps/document_indexing/tests/test_models.py index 9cdb8efbf7..6ef6d98aaf 100644 --- a/mayan/apps/document_indexing/tests/test_models.py +++ b/mayan/apps/document_indexing/tests/test_models.py @@ -5,13 +5,13 @@ from django.utils.encoding import force_text from mayan.apps.common.tests import BaseTestCase from mayan.apps.documents.tests import ( - DocumentTestMixin, TEST_SMALL_DOCUMENT_PATH + TEST_SMALL_DOCUMENT_PATH, DocumentTestMixin ) from mayan.apps.documents.tests.literals import ( TEST_DOCUMENT_DESCRIPTION, TEST_DOCUMENT_DESCRIPTION_EDITED, TEST_DOCUMENT_LABEL_EDITED ) -from mayan.apps.metadata.models import MetadataType, DocumentTypeMetadataType +from mayan.apps.metadata.models import DocumentTypeMetadataType, MetadataType from ..models import Index, IndexInstanceNode, IndexTemplateNode diff --git a/mayan/apps/document_indexing/urls.py b/mayan/apps/document_indexing/urls.py index 3ee1fd0bbd..1a28b7f4d4 100644 --- a/mayan/apps/document_indexing/urls.py +++ b/mayan/apps/document_indexing/urls.py @@ -9,8 +9,8 @@ from .api_views import ( ) from .views import ( DocumentIndexNodeListView, IndexInstanceNodeView, IndexListView, - RebuildIndexesView, SetupIndexDocumentTypesView, SetupIndexCreateView, - SetupIndexDeleteView, SetupIndexEditView, SetupIndexListView, + RebuildIndexesView, SetupIndexCreateView, SetupIndexDeleteView, + SetupIndexDocumentTypesView, SetupIndexEditView, SetupIndexListView, SetupIndexTreeTemplateListView, TemplateNodeCreateView, TemplateNodeDeleteView, TemplateNodeEditView ) diff --git a/mayan/apps/document_indexing/views.py b/mayan/apps/document_indexing/views.py index 50e9c8fdeb..810a52eadc 100644 --- a/mayan/apps/document_indexing/views.py +++ b/mayan/apps/document_indexing/views.py @@ -5,12 +5,13 @@ from django.shortcuts import get_object_or_404 from django.template import RequestContext from django.urls import reverse, reverse_lazy from django.utils.html import mark_safe -from django.utils.translation import ugettext_lazy as _, ungettext +from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ungettext from mayan.apps.acls.models import AccessControlList from mayan.apps.common.views import ( - AssignRemoveView, FormView, SingleObjectCreateView, - SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView + AssignRemoveView, FormView, SingleObjectCreateView, SingleObjectDeleteView, + SingleObjectEditView, SingleObjectListView ) from mayan.apps.documents.models import Document, DocumentType from mayan.apps.documents.permissions import permission_document_view diff --git a/mayan/apps/document_indexing/widgets.py b/mayan/apps/document_indexing/widgets.py index da2fb21c5d..d5517ebd56 100644 --- a/mayan/apps/document_indexing/widgets.py +++ b/mayan/apps/document_indexing/widgets.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.apps import apps from django.utils.encoding import force_text -from django.utils.html import mark_safe, escape +from django.utils.html import escape, mark_safe from .icons import icon_index, icon_index_level_up, icon_node_with_documents diff --git a/mayan/apps/document_parsing/admin.py b/mayan/apps/document_parsing/admin.py index 258da5ec3d..74a3267e0d 100644 --- a/mayan/apps/document_parsing/admin.py +++ b/mayan/apps/document_parsing/admin.py @@ -2,9 +2,7 @@ from __future__ import unicode_literals from django.contrib import admin -from .models import ( - DocumentPageContent, DocumentVersionParseError -) +from .models import DocumentPageContent, DocumentVersionParseError @admin.register(DocumentPageContent) diff --git a/mayan/apps/document_parsing/apps.py b/mayan/apps/document_parsing/apps.py index a990b9d504..8c78d8340e 100644 --- a/mayan/apps/document_parsing/apps.py +++ b/mayan/apps/document_parsing/apps.py @@ -1,15 +1,15 @@ from __future__ import unicode_literals -from datetime import timedelta import logging - -from kombu import Exchange, Queue +from datetime import timedelta from django.apps import apps from django.db.models.signals import post_save from django.utils.timezone import now from django.utils.translation import ugettext_lazy as _ +from kombu import Exchange, Queue + from mayan.apps.acls import ModelPermission from mayan.apps.common import ( MayanAppConfig, menu_facet, menu_multi_item, menu_object, menu_secondary, @@ -17,7 +17,7 @@ from mayan.apps.common import ( ) from mayan.apps.common.classes import ModelAttribute, ModelField from mayan.apps.common.settings import settings_db_sync_task_delay -from mayan.apps.documents.search import document_search, document_page_search +from mayan.apps.documents.search import document_page_search, document_search from mayan.apps.documents.signals import post_version_upload from mayan.apps.documents.widgets import document_link from mayan.apps.navigation import SourceColumn @@ -29,9 +29,9 @@ from .handlers import ( handler_parse_document_version ) from .links import ( - link_document_content, link_document_page_content, - link_document_content_download, link_document_parsing_errors_list, - link_document_submit_multiple, link_document_submit, + link_document_content, link_document_content_download, + link_document_page_content, link_document_parsing_errors_list, + link_document_submit, link_document_submit_multiple, link_document_type_parsing_settings, link_document_type_submit, link_error_list ) diff --git a/mayan/apps/document_parsing/forms.py b/mayan/apps/document_parsing/forms.py index 500cfeb160..aa1ae067bf 100644 --- a/mayan/apps/document_parsing/forms.py +++ b/mayan/apps/document_parsing/forms.py @@ -4,7 +4,8 @@ from django import forms from django.utils.encoding import force_text from django.utils.html import conditional_escape from django.utils.safestring import mark_safe -from django.utils.translation import ugettext_lazy as _, ugettext +from django.utils.translation import ugettext +from django.utils.translation import ugettext_lazy as _ from mayan.apps.acls.models import AccessControlList from mayan.apps.common.widgets import TextAreaDiv diff --git a/mayan/apps/document_parsing/links.py b/mayan/apps/document_parsing/links.py index 865d26c8e0..852eed67c2 100644 --- a/mayan/apps/document_parsing/links.py +++ b/mayan/apps/document_parsing/links.py @@ -5,8 +5,8 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.navigation import Link, get_cascade_condition from .icons import ( - icon_document_content, icon_document_parsing_errors_list, - icon_document_content_download, icon_document_type_parsing_settings, + icon_document_content, icon_document_content_download, + icon_document_parsing_errors_list, icon_document_type_parsing_settings, icon_document_type_submit, icon_link_error_list ) from .permissions import ( diff --git a/mayan/apps/document_parsing/migrations/0001_initial.py b/mayan/apps/document_parsing/migrations/0001_initial.py index 98c6b861ed..f49c6a5f55 100644 --- a/mayan/apps/document_parsing/migrations/0001_initial.py +++ b/mayan/apps/document_parsing/migrations/0001_initial.py @@ -1,9 +1,7 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-08-23 18:55 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/document_parsing/migrations/0002_auto_20170827_1617.py b/mayan/apps/document_parsing/migrations/0002_auto_20170827_1617.py index 8776082d69..3a54503bb9 100644 --- a/mayan/apps/document_parsing/migrations/0002_auto_20170827_1617.py +++ b/mayan/apps/document_parsing/migrations/0002_auto_20170827_1617.py @@ -1,9 +1,7 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-08-27 16:17 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/document_parsing/migrations/0003_documenttypesettings.py b/mayan/apps/document_parsing/migrations/0003_documenttypesettings.py index 388e867545..95931de955 100644 --- a/mayan/apps/document_parsing/migrations/0003_documenttypesettings.py +++ b/mayan/apps/document_parsing/migrations/0003_documenttypesettings.py @@ -1,29 +1,35 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.11 on 2018-04-10 06:39 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models def create_parsing_setting_for_existing_document_types(apps, schema_editor): DocumentType = apps.get_model('documents', 'DocumentType') - DocumentTypeSettings = apps.get_model('document_parsing', 'DocumentTypeSettings') + DocumentTypeSettings = apps.get_model( + 'document_parsing', 'DocumentTypeSettings' + ) for document_type in DocumentType.objects.using(schema_editor.connection.alias).all(): try: - DocumentTypeSettings.objects.using(schema_editor.connection.alias).create(document_type=document_type) + DocumentTypeSettings.objects.using( + schema_editor.connection.alias + ).create(document_type=document_type) except DocumentTypeSettings.DoesNotExist: pass def delete_parsing_setting_for_existing_document_types(apps, schema_editor): DocumentType = apps.get_model('documents', 'DocumentType') - DocumentTypeSettings = apps.get_model('document_parsing', 'DocumentTypeSettings') + DocumentTypeSettings = apps.get_model( + 'document_parsing', 'DocumentTypeSettings' + ) for document_type in DocumentType.objects.using(schema_editor.connection.alias).all(): try: - DocumentTypeSettings.objects.using(schema_editor.connection.alias).get(document_type=document_type).delete() + DocumentTypeSettings.objects.using( + schema_editor.connection.alias + ).get(document_type=document_type).delete() except DocumentTypeSettings.DoesNotExist: pass @@ -39,9 +45,26 @@ class Migration(migrations.Migration): migrations.CreateModel( name='DocumentTypeSettings', fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('auto_parsing', models.BooleanField(default=True, verbose_name='Automatically queue newly created documents for parsing.')), - ('document_type', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='parsing_settings', to='documents.DocumentType', verbose_name='Document type')), + ( + 'id', models.AutoField( + auto_created=True, primary_key=True, serialize=False, + verbose_name='ID' + ) + ), + ( + 'auto_parsing', models.BooleanField( + default=True, verbose_name='Automatically queue newly ' + 'created documents for parsing.' + ) + ), + ( + 'document_type', models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name='parsing_settings', + to='documents.DocumentType', + verbose_name='Document type' + ) + ), ], options={ 'verbose_name': 'Document type settings', diff --git a/mayan/apps/document_parsing/migrations/0004_auto_20180917_0645.py b/mayan/apps/document_parsing/migrations/0004_auto_20180917_0645.py index 5d8f7f5ab7..eda5b59ffa 100644 --- a/mayan/apps/document_parsing/migrations/0004_auto_20180917_0645.py +++ b/mayan/apps/document_parsing/migrations/0004_auto_20180917_0645.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.11 on 2018-09-17 06:45 from __future__ import unicode_literals from django.db import migrations, models @@ -15,6 +13,9 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='documentpagecontent', name='content', - field=models.TextField(blank=True, help_text='The actual text content as extracted by the document parsing backend.', verbose_name='Content'), + field=models.TextField( + blank=True, help_text='The actual text content as extracted ' + 'by the document parsing backend.', verbose_name='Content' + ), ), ] diff --git a/mayan/apps/document_parsing/tests/literals.py b/mayan/apps/document_parsing/tests/literals.py index 280e1eaa15..e054d56c13 100644 --- a/mayan/apps/document_parsing/tests/literals.py +++ b/mayan/apps/document_parsing/tests/literals.py @@ -1,3 +1,4 @@ from __future__ import unicode_literals +TEST_DOCUMENT_CONTENT = 'Sample text' TEST_PARSING_INDEX_NODE_TEMPLATE = '{% if "sample" in document.content.lower() %}sample{% endif %}' diff --git a/mayan/apps/document_parsing/tests/test_api.py b/mayan/apps/document_parsing/tests/test_api.py index 7147f5de62..d1d1e155c7 100644 --- a/mayan/apps/document_parsing/tests/test_api.py +++ b/mayan/apps/document_parsing/tests/test_api.py @@ -4,7 +4,7 @@ from django.test import override_settings from rest_framework import status -from mayan.apps.documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT +from mayan.apps.documents.tests import TEST_HYBRID_DOCUMENT, DocumentTestMixin from mayan.apps.rest_api.tests import BaseAPITestCase from ..permissions import permission_content_view diff --git a/mayan/apps/document_parsing/tests/test_events.py b/mayan/apps/document_parsing/tests/test_events.py index a4f7aa8d3b..a0e48c8f2c 100644 --- a/mayan/apps/document_parsing/tests/test_events.py +++ b/mayan/apps/document_parsing/tests/test_events.py @@ -6,8 +6,8 @@ from mayan.apps.documents.tests.literals import TEST_DOCUMENT_FILENAME from mayan.apps.documents.tests.test_models import GenericDocumentTestCase from ..events import ( - event_parsing_document_version_submit, - event_parsing_document_version_finish + event_parsing_document_version_finish, + event_parsing_document_version_submit ) diff --git a/mayan/apps/document_parsing/tests/test_indexing.py b/mayan/apps/document_parsing/tests/test_indexing.py index e40e78180a..cd0f7606ff 100644 --- a/mayan/apps/document_parsing/tests/test_indexing.py +++ b/mayan/apps/document_parsing/tests/test_indexing.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals from django.test import override_settings from mayan.apps.common.tests import BaseTestCase -from mayan.apps.documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT from mayan.apps.document_indexing.models import Index, IndexInstanceNode from mayan.apps.document_indexing.tests.literals import TEST_INDEX_LABEL +from mayan.apps.documents.tests import TEST_HYBRID_DOCUMENT, DocumentTestMixin from .literals import TEST_PARSING_INDEX_NODE_TEMPLATE diff --git a/mayan/apps/document_parsing/tests/test_models.py b/mayan/apps/document_parsing/tests/test_models.py index 7398b74646..8209119ed4 100644 --- a/mayan/apps/document_parsing/tests/test_models.py +++ b/mayan/apps/document_parsing/tests/test_models.py @@ -2,9 +2,11 @@ from __future__ import unicode_literals from django.test import override_settings -from mayan.apps.documents.tests import GenericDocumentTestCase, TEST_HYBRID_DOCUMENT +from mayan.apps.documents.tests import ( + TEST_HYBRID_DOCUMENT, GenericDocumentTestCase +) -TEST_DOCUMENT_CONTENT = 'Sample text' +from .literals import TEST_DOCUMENT_CONTENT class DocumentAutoParsingTestCase(GenericDocumentTestCase): diff --git a/mayan/apps/document_parsing/tests/test_parsers.py b/mayan/apps/document_parsing/tests/test_parsers.py index cde12dde97..d5617b201a 100644 --- a/mayan/apps/document_parsing/tests/test_parsers.py +++ b/mayan/apps/document_parsing/tests/test_parsers.py @@ -3,11 +3,11 @@ from __future__ import unicode_literals from django.test import override_settings from mayan.apps.common.tests import BaseTestCase -from mayan.apps.documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT +from mayan.apps.documents.tests import TEST_HYBRID_DOCUMENT, DocumentTestMixin from ..parsers import PopplerParser -TEST_DOCUMENT_CONTENT = 'Sample text' +from .literals import TEST_DOCUMENT_CONTENT @override_settings(OCR_AUTO_OCR=False) diff --git a/mayan/apps/document_parsing/tests/test_views.py b/mayan/apps/document_parsing/tests/test_views.py index bec1550bba..8d2f8f6c4c 100644 --- a/mayan/apps/document_parsing/tests/test_views.py +++ b/mayan/apps/document_parsing/tests/test_views.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.test import override_settings from mayan.apps.documents.tests import ( - GenericDocumentViewTestCase, TEST_HYBRID_DOCUMENT + TEST_HYBRID_DOCUMENT, GenericDocumentViewTestCase ) from ..permissions import ( @@ -11,7 +11,7 @@ from ..permissions import ( ) from ..utils import get_document_content -TEST_DOCUMENT_CONTENT = 'Sample text' +from .literals import TEST_DOCUMENT_CONTENT @override_settings(DOCUMENT_PARSING_AUTO_PARSING=True) diff --git a/mayan/apps/document_parsing/urls.py b/mayan/apps/document_parsing/urls.py index 08e5f3c289..2e745667ad 100644 --- a/mayan/apps/document_parsing/urls.py +++ b/mayan/apps/document_parsing/urls.py @@ -4,10 +4,9 @@ from django.conf.urls import url from .api_views import APIDocumentPageContentView from .views import ( - DocumentContentView, DocumentContentDownloadView, - DocumentPageContentView, DocumentParsingErrorsListView, - DocumentSubmitView, DocumentTypeSettingsEditView, DocumentTypeSubmitView, - ParseErrorListView + DocumentContentDownloadView, DocumentContentView, DocumentPageContentView, + DocumentParsingErrorsListView, DocumentSubmitView, + DocumentTypeSettingsEditView, DocumentTypeSubmitView, ParseErrorListView ) urlpatterns = [ diff --git a/mayan/apps/document_parsing/views.py b/mayan/apps/document_parsing/views.py index 9ed149e018..c0612536c3 100644 --- a/mayan/apps/document_parsing/views.py +++ b/mayan/apps/document_parsing/views.py @@ -4,7 +4,8 @@ from django.contrib import messages from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404 from django.urls import reverse, reverse_lazy -from django.utils.translation import ugettext_lazy as _, ungettext +from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ungettext from mayan.apps.common.generics import ( FormView, MultipleObjectConfirmActionView, SingleObjectDetailView, diff --git a/mayan/apps/document_signatures/apps.py b/mayan/apps/document_signatures/apps.py index 032573a747..a71cf62545 100644 --- a/mayan/apps/document_signatures/apps.py +++ b/mayan/apps/document_signatures/apps.py @@ -2,12 +2,12 @@ from __future__ import unicode_literals import logging -from kombu import Exchange, Queue - from django.apps import apps -from django.db.models.signals import post_save, post_delete +from django.db.models.signals import post_delete, post_save from django.utils.translation import ugettext_lazy as _ +from kombu import Exchange, Queue + from mayan.apps.acls import ModelPermission from mayan.apps.common import ( MayanAppConfig, menu_facet, menu_object, menu_sidebar, menu_tools @@ -17,15 +17,14 @@ from mayan.celery import app from .handlers import unverify_key_signatures, verify_key_signatures from .links import ( - link_all_document_version_signature_verify, - link_document_signature_list, + link_all_document_version_signature_verify, link_document_signature_list, link_document_version_signature_delete, link_document_version_signature_detached_create, - link_document_version_signature_embedded_create, link_document_version_signature_details, link_document_version_signature_download, + link_document_version_signature_embedded_create, link_document_version_signature_list, - link_document_version_signature_upload, + link_document_version_signature_upload ) from .permissions import ( permission_document_version_sign_detached, @@ -33,7 +32,7 @@ from .permissions import ( permission_document_version_signature_delete, permission_document_version_signature_download, permission_document_version_signature_upload, - permission_document_version_signature_view, + permission_document_version_signature_view ) from .queues import * # NOQA diff --git a/mayan/apps/document_signatures/handlers.py b/mayan/apps/document_signatures/handlers.py index 988f4da513..8155932cef 100644 --- a/mayan/apps/document_signatures/handlers.py +++ b/mayan/apps/document_signatures/handlers.py @@ -1,8 +1,8 @@ from __future__ import unicode_literals from .tasks import ( - task_unverify_key_signatures, task_verify_missing_embedded_signature, - task_verify_key_signatures + task_unverify_key_signatures, task_verify_key_signatures, + task_verify_missing_embedded_signature ) diff --git a/mayan/apps/document_signatures/migrations/0001_initial.py b/mayan/apps/document_signatures/migrations/0001_initial.py index 9b78380944..9443014710 100644 --- a/mayan/apps/document_signatures/migrations/0001_initial.py +++ b/mayan/apps/document_signatures/migrations/0001_initial.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations from django.core.files.storage import FileSystemStorage +from django.db import migrations, models import mayan.apps.document_signatures.models diff --git a/mayan/apps/document_signatures/migrations/0002_auto_20150608_1902.py b/mayan/apps/document_signatures/migrations/0002_auto_20150608_1902.py index 4fd69b1b45..34f6c20510 100644 --- a/mayan/apps/document_signatures/migrations/0002_auto_20150608_1902.py +++ b/mayan/apps/document_signatures/migrations/0002_auto_20150608_1902.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations from django.core.files.storage import FileSystemStorage +from django.db import migrations, models import mayan.apps.document_signatures.models @@ -26,9 +25,9 @@ class Migration(migrations.Migration): model_name='documentversionsignature', name='signature_file', field=models.FileField( - storage=FileSystemStorage(), - upload_to=mayan.apps.document_signatures.models.upload_to, null=True, - verbose_name='Signature file', blank=True + blank=True, null=True, storage=FileSystemStorage(), + upload_to=mayan.apps.document_signatures.models.upload_to, + verbose_name='Signature file', ), preserve_default=True, ), diff --git a/mayan/apps/document_signatures/migrations/0003_auto_20160325_0052.py b/mayan/apps/document_signatures/migrations/0003_auto_20160325_0052.py index 737276a07c..73972197b5 100644 --- a/mayan/apps/document_signatures/migrations/0003_auto_20160325_0052.py +++ b/mayan/apps/document_signatures/migrations/0003_auto_20160325_0052.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models from django.core.files.storage import FileSystemStorage +from django.db import migrations, models import mayan.apps.document_signatures.models diff --git a/mayan/apps/document_signatures/migrations/0004_auto_20160325_0418.py b/mayan/apps/document_signatures/migrations/0004_auto_20160325_0418.py index 8cbbd1c419..e0350ad5f1 100644 --- a/mayan/apps/document_signatures/migrations/0004_auto_20160325_0418.py +++ b/mayan/apps/document_signatures/migrations/0004_auto_20160325_0418.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.db import migrations, models diff --git a/mayan/apps/document_signatures/migrations/0005_auto_20160325_0748.py b/mayan/apps/document_signatures/migrations/0005_auto_20160325_0748.py index 76bbc3bee3..49dc88f222 100644 --- a/mayan/apps/document_signatures/migrations/0005_auto_20160325_0748.py +++ b/mayan/apps/document_signatures/migrations/0005_auto_20160325_0748.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.db import migrations diff --git a/mayan/apps/document_signatures/migrations/0006_auto_20160326_0616.py b/mayan/apps/document_signatures/migrations/0006_auto_20160326_0616.py index adb06aeea3..645d511405 100644 --- a/mayan/apps/document_signatures/migrations/0006_auto_20160326_0616.py +++ b/mayan/apps/document_signatures/migrations/0006_auto_20160326_0616.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.db import migrations, models @@ -15,8 +14,8 @@ class Migration(migrations.Migration): model_name='signaturebasemodel', name='public_key_fingerprint', field=models.CharField( - verbose_name='Public key fingerprint', max_length=40, - null=True, editable=False, blank=True + blank=True, editable=False, max_length=40, + null=True, verbose_name='Public key fingerprint' ), ), ] diff --git a/mayan/apps/document_signatures/tests/test_links.py b/mayan/apps/document_signatures/tests/test_links.py index 77d6d90cb9..e11e5fe157 100644 --- a/mayan/apps/document_signatures/tests/test_links.py +++ b/mayan/apps/document_signatures/tests/test_links.py @@ -4,18 +4,19 @@ from django.core.files import File from django.urls import reverse from mayan.apps.documents.tests import ( - GenericDocumentViewTestCase, TEST_DOCUMENT_PATH + TEST_DOCUMENT_PATH, GenericDocumentViewTestCase ) from ..links import ( link_document_version_signature_delete, - link_document_version_signature_details, + link_document_version_signature_details ) from ..models import DetachedSignature from ..permissions import ( permission_document_version_signature_delete, permission_document_version_signature_view ) + from .literals import TEST_SIGNATURE_FILE_PATH, TEST_SIGNED_DOCUMENT_PATH diff --git a/mayan/apps/document_signatures/tests/test_models.py b/mayan/apps/document_signatures/tests/test_models.py index 2113397882..b1f91de4b0 100644 --- a/mayan/apps/document_signatures/tests/test_models.py +++ b/mayan/apps/document_signatures/tests/test_models.py @@ -13,14 +13,16 @@ from mayan.apps.django_gpg.tests.literals import ( TEST_KEY_DATA, TEST_KEY_PASSPHRASE ) from mayan.apps.documents.models import DocumentType, DocumentVersion -from mayan.apps.documents.tests import TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL +from mayan.apps.documents.tests import ( + TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL +) from ..models import DetachedSignature, EmbeddedSignature from ..tasks import task_verify_missing_embedded_signature from .literals import ( - TEST_SIGNED_DOCUMENT_PATH, TEST_SIGNATURE_FILE_PATH, TEST_KEY_FILE, - TEST_KEY_ID, TEST_SIGNATURE_ID + TEST_KEY_FILE, TEST_KEY_ID, TEST_SIGNATURE_FILE_PATH, TEST_SIGNATURE_ID, + TEST_SIGNED_DOCUMENT_PATH ) diff --git a/mayan/apps/document_signatures/tests/test_views.py b/mayan/apps/document_signatures/tests/test_views.py index 870a682a02..448dc7d718 100644 --- a/mayan/apps/document_signatures/tests/test_views.py +++ b/mayan/apps/document_signatures/tests/test_views.py @@ -9,7 +9,7 @@ from django_downloadview.test import assert_download_response from mayan.apps.django_gpg.models import Key from mayan.apps.documents.models import DocumentVersion from mayan.apps.documents.tests import ( - GenericDocumentViewTestCase, TEST_DOCUMENT_PATH + TEST_DOCUMENT_PATH, GenericDocumentViewTestCase ) from ..models import DetachedSignature, EmbeddedSignature @@ -22,7 +22,7 @@ from ..permissions import ( ) from .literals import ( - TEST_SIGNATURE_FILE_PATH, TEST_SIGNED_DOCUMENT_PATH, TEST_KEY_FILE + TEST_KEY_FILE, TEST_SIGNATURE_FILE_PATH, TEST_SIGNED_DOCUMENT_PATH ) TEST_UNSIGNED_DOCUMENT_COUNT = 4 diff --git a/mayan/apps/document_signatures/views.py b/mayan/apps/document_signatures/views.py index 5f837902d6..50b0cc9939 100644 --- a/mayan/apps/document_signatures/views.py +++ b/mayan/apps/document_signatures/views.py @@ -22,8 +22,7 @@ from mayan.apps.django_gpg.permissions import permission_key_sign from mayan.apps.documents.models import DocumentVersion from .forms import ( - DocumentVersionSignatureCreateForm, - DocumentVersionSignatureDetailForm + DocumentVersionSignatureCreateForm, DocumentVersionSignatureDetailForm ) from .icons import icon_document_signature_list from .links import ( @@ -39,7 +38,7 @@ from .permissions import ( permission_document_version_signature_download, permission_document_version_signature_upload, permission_document_version_signature_verify, - permission_document_version_signature_view, + permission_document_version_signature_view ) from .tasks import task_verify_missing_embedded_signature diff --git a/mayan/apps/document_states/api_views.py b/mayan/apps/document_states/api_views.py index 8214685b7b..c05868c2a6 100644 --- a/mayan/apps/document_states/api_views.py +++ b/mayan/apps/document_states/api_views.py @@ -20,7 +20,7 @@ from .permissions import ( ) from .serializers import ( NewWorkflowDocumentTypeSerializer, WorkflowDocumentTypeSerializer, - WorkflowInstanceSerializer, WorkflowInstanceLogEntrySerializer, + WorkflowInstanceLogEntrySerializer, WorkflowInstanceSerializer, WorkflowSerializer, WorkflowStateSerializer, WorkflowTransitionSerializer, WritableWorkflowInstanceLogEntrySerializer, WritableWorkflowSerializer, WritableWorkflowTransitionSerializer diff --git a/mayan/apps/document_states/apps.py b/mayan/apps/document_states/apps.py index 80b4aa31c4..e4a0a15899 100644 --- a/mayan/apps/document_states/apps.py +++ b/mayan/apps/document_states/apps.py @@ -24,22 +24,23 @@ from .handlers import ( handler_index_document, handler_trigger_transition, launch_workflow ) from .links import ( - link_document_workflow_instance_list, link_setup_workflow_document_types, - link_setup_workflow_create, link_setup_workflow_delete, + link_document_workflow_instance_list, link_setup_workflow_create, + link_setup_workflow_delete, link_setup_workflow_document_types, link_setup_workflow_edit, link_setup_workflow_list, - link_setup_workflow_states, link_setup_workflow_state_action_delete, + link_setup_workflow_state_action_delete, link_setup_workflow_state_action_edit, link_setup_workflow_state_action_list, link_setup_workflow_state_action_selection, link_setup_workflow_state_create, link_setup_workflow_state_delete, - link_setup_workflow_state_edit, link_setup_workflow_transitions, + link_setup_workflow_state_edit, link_setup_workflow_states, link_setup_workflow_transition_create, link_setup_workflow_transition_delete, link_setup_workflow_transition_edit, - link_tool_launch_all_workflows, link_workflow_instance_detail, - link_workflow_instance_transition, link_workflow_document_list, - link_workflow_list, link_workflow_preview, - link_workflow_state_document_list, link_workflow_state_list, - link_workflow_instance_transition_events + link_setup_workflow_transitions, link_tool_launch_all_workflows, + link_workflow_document_list, link_workflow_instance_detail, + link_workflow_instance_transition, + link_workflow_instance_transition_events, link_workflow_list, + link_workflow_preview, link_workflow_state_document_list, + link_workflow_state_list ) from .permissions import ( permission_workflow_delete, permission_workflow_edit, diff --git a/mayan/apps/document_states/classes.py b/mayan/apps/document_states/classes.py index b06de1c2cf..498c19dac2 100644 --- a/mayan/apps/document_states/classes.py +++ b/mayan/apps/document_states/classes.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from importlib import import_module import logging +from importlib import import_module from django.apps import apps from django.utils import six diff --git a/mayan/apps/document_states/links.py b/mayan/apps/document_states/links.py index bf6fb91ec7..27b1fd89c0 100644 --- a/mayan/apps/document_states/links.py +++ b/mayan/apps/document_states/links.py @@ -14,7 +14,7 @@ from .icons import ( from .permissions import ( permission_workflow_create, permission_workflow_delete, permission_workflow_edit, permission_workflow_tools, - permission_workflow_view, + permission_workflow_view ) link_document_workflow_instance_list = Link( diff --git a/mayan/apps/document_states/migrations/0001_initial.py b/mayan/apps/document_states/migrations/0001_initial.py index 2a8018ba1f..70cfa1fa67 100644 --- a/mayan/apps/document_states/migrations/0001_initial.py +++ b/mayan/apps/document_states/migrations/0001_initial.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/document_states/migrations/0002_workflowstate_completion.py b/mayan/apps/document_states/migrations/0002_workflowstate_completion.py index 5c91b9d340..56b91427ac 100644 --- a/mayan/apps/document_states/migrations/0002_workflowstate_completion.py +++ b/mayan/apps/document_states/migrations/0002_workflowstate_completion.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -15,10 +14,10 @@ class Migration(migrations.Migration): model_name='workflowstate', name='completion', field=models.IntegerField( - default=0, help_text='Enter the percent of completion that ' - 'this state represents in relation to the workflow. Use ' - 'numbers without the percent sign.', verbose_name='Completion', - blank=True + blank=True, default=0, help_text='Enter the percent of ' + 'completion that this state represents in relation to the ' + 'workflow. Use numbers without the percent sign.', + verbose_name='Completion', ), preserve_default=True, ), diff --git a/mayan/apps/document_states/migrations/0003_auto_20170325_0447.py b/mayan/apps/document_states/migrations/0003_auto_20170325_0447.py index 5dcaa0bee0..3722b10412 100644 --- a/mayan/apps/document_states/migrations/0003_auto_20170325_0447.py +++ b/mayan/apps/document_states/migrations/0003_auto_20170325_0447.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.5 on 2017-03-25 04:47 from __future__ import unicode_literals from django.db import migrations diff --git a/mayan/apps/document_states/migrations/0004_workflow_internal_name.py b/mayan/apps/document_states/migrations/0004_workflow_internal_name.py index 3750439352..de5c8943a9 100644 --- a/mayan/apps/document_states/migrations/0004_workflow_internal_name.py +++ b/mayan/apps/document_states/migrations/0004_workflow_internal_name.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-06-03 18:26 from __future__ import unicode_literals from django.db import migrations, models diff --git a/mayan/apps/document_states/migrations/0005_auto_20170803_0638.py b/mayan/apps/document_states/migrations/0005_auto_20170803_0638.py index 22bf7c813f..636afd9339 100644 --- a/mayan/apps/document_states/migrations/0005_auto_20170803_0638.py +++ b/mayan/apps/document_states/migrations/0005_auto_20170803_0638.py @@ -1,9 +1,7 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-08-03 06:38 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): @@ -17,8 +15,19 @@ class Migration(migrations.Migration): migrations.CreateModel( name='WorkflowTransitionTriggerEvent', fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('stored_event_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='trigger_events', to='events.EventType', verbose_name='Event type')), + ( + 'id', models.AutoField( + auto_created=True, primary_key=True, serialize=False, + verbose_name='ID' + ) + ), + ( + 'stored_event_type', models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='trigger_events', to='events.EventType', + verbose_name='Event type' + ) + ), ], options={ 'verbose_name': 'Workflow transition trigger event', @@ -28,16 +37,29 @@ class Migration(migrations.Migration): migrations.AddField( model_name='workflowtransition', name='trigger_time_period', - field=models.PositiveIntegerField(blank=True, help_text='Amount of time after which this transition will trigger on its own.', null=True, verbose_name='Trigger time period'), + field=models.PositiveIntegerField( + blank=True, help_text='Amount of time after which this ' + 'transition will trigger on its own.', null=True, + verbose_name='Trigger time period' + ), ), migrations.AddField( model_name='workflowtransition', name='trigger_time_unit', - field=models.CharField(blank=True, choices=[('days', 'Days'), ('hours', 'Hours'), ('minutes', 'Minutes')], max_length=8, null=True, verbose_name='Trigger time unit'), + field=models.CharField( + blank=True, choices=[ + ('days', 'Days'), ('hours', 'Hours'), + ('minutes', 'Minutes') + ], max_length=8, null=True, verbose_name='Trigger time unit' + ), ), migrations.AddField( model_name='workflowtransitiontriggerevent', name='transition', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='document_states.WorkflowTransition', verbose_name='Transition'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to='document_states.WorkflowTransition', + verbose_name='Transition' + ), ), ] diff --git a/mayan/apps/document_states/migrations/0006_auto_20170803_0651.py b/mayan/apps/document_states/migrations/0006_auto_20170803_0651.py index 5b73e2189f..aff1ba5952 100644 --- a/mayan/apps/document_states/migrations/0006_auto_20170803_0651.py +++ b/mayan/apps/document_states/migrations/0006_auto_20170803_0651.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-08-03 06:51 from __future__ import unicode_literals from django.db import migrations diff --git a/mayan/apps/document_states/migrations/0007_auto_20170803_0728.py b/mayan/apps/document_states/migrations/0007_auto_20170803_0728.py index 81bdbd2c54..f5cd94c754 100644 --- a/mayan/apps/document_states/migrations/0007_auto_20170803_0728.py +++ b/mayan/apps/document_states/migrations/0007_auto_20170803_0728.py @@ -1,10 +1,8 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-08-03 07:28 from __future__ import unicode_literals +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): @@ -17,16 +15,28 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='workflowinstancelogentry', name='user', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='User'), + field=models.ForeignKey( + blank=True, null=True, + on_delete=django.db.models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, verbose_name='User' + ), ), migrations.AlterField( model_name='workflowtransitiontriggerevent', name='event_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='events.EventType', verbose_name='Event type'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to='events.EventType', verbose_name='Event type' + ), ), migrations.AlterField( model_name='workflowtransitiontriggerevent', name='transition', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='trigger_events', to='document_states.WorkflowTransition', verbose_name='Transition'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='trigger_events', + to='document_states.WorkflowTransition', + verbose_name='Transition' + ), ), ] diff --git a/mayan/apps/document_states/migrations/0008_auto_20170803_0752.py b/mayan/apps/document_states/migrations/0008_auto_20170803_0752.py index 8fa7a56eda..3dad4f2390 100644 --- a/mayan/apps/document_states/migrations/0008_auto_20170803_0752.py +++ b/mayan/apps/document_states/migrations/0008_auto_20170803_0752.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-08-03 07:52 from __future__ import unicode_literals from django.db import migrations diff --git a/mayan/apps/document_states/migrations/0009_auto_20170807_0612.py b/mayan/apps/document_states/migrations/0009_auto_20170807_0612.py index e58aeea9b9..dbc8d94d01 100644 --- a/mayan/apps/document_states/migrations/0009_auto_20170807_0612.py +++ b/mayan/apps/document_states/migrations/0009_auto_20170807_0612.py @@ -1,9 +1,7 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-08-07 06:12 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): @@ -16,13 +14,49 @@ class Migration(migrations.Migration): migrations.CreateModel( name='WorkflowStateAction', fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('label', models.CharField(max_length=255, verbose_name='Label')), - ('enabled', models.BooleanField(default=True, verbose_name='Enabled')), - ('when', models.PositiveIntegerField(choices=[(1, 'On entry'), (2, 'On exit')], default=1, help_text='At which moment of the state this action will execute', verbose_name='When')), - ('action_path', models.CharField(help_text='The dotted Python path to the workflow action class to execute.', max_length=128, verbose_name='Entry action path')), - ('action_data', models.TextField(blank=True, verbose_name='Entry action data')), - ('state', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='actions', to='document_states.WorkflowState', verbose_name='Workflow state')), + ( + 'id', models.AutoField( + auto_created=True, primary_key=True, serialize=False, + verbose_name='ID' + ) + ), + ( + 'label', models.CharField( + max_length=255, verbose_name='Label' + ) + ), + ( + 'enabled', models.BooleanField( + default=True, verbose_name='Enabled' + ) + ), + ( + 'when', models.PositiveIntegerField( + choices=[(1, 'On entry'), (2, 'On exit')], default=1, + help_text='At which moment of the state this action ' + 'will execute', verbose_name='When' + ) + ), + ( + 'action_path', models.CharField( + help_text='The dotted Python path to the workflow ' + 'action class to execute.', max_length=128, + verbose_name='Entry action path' + ) + ), + ( + 'action_data', models.TextField( + blank=True, verbose_name='Entry action data' + ) + ), + ( + 'state', models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='actions', + to='document_states.WorkflowState', + verbose_name='Workflow state' + ) + ), ], options={ 'ordering': ('label',), diff --git a/mayan/apps/document_states/migrations/0010_auto_20180310_1717.py b/mayan/apps/document_states/migrations/0010_auto_20180310_1717.py index a73d4590b9..7d2d957848 100644 --- a/mayan/apps/document_states/migrations/0010_auto_20180310_1717.py +++ b/mayan/apps/document_states/migrations/0010_auto_20180310_1717.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-03-10 17:17 from __future__ import unicode_literals from django.db import migrations @@ -14,6 +12,10 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='workflowinstancelogentry', - options={'ordering': ('datetime',), 'verbose_name': 'Workflow instance log entry', 'verbose_name_plural': 'Workflow instance log entries'}, + options={ + 'ordering': ('datetime',), + 'verbose_name': 'Workflow instance log entry', + 'verbose_name_plural': 'Workflow instance log entries' + }, ), ] diff --git a/mayan/apps/document_states/migrations/0011_auto_20180315_0029.py b/mayan/apps/document_states/migrations/0011_auto_20180315_0029.py index a33232b5b6..0069858b58 100644 --- a/mayan/apps/document_states/migrations/0011_auto_20180315_0029.py +++ b/mayan/apps/document_states/migrations/0011_auto_20180315_0029.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-03-15 00:29 from __future__ import unicode_literals from django.db import migrations @@ -14,6 +12,9 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='workflowinstance', - options={'ordering': ('workflow',), 'verbose_name': 'Workflow instance', 'verbose_name_plural': 'Workflow instances'}, + options={ + 'ordering': ('workflow',), 'verbose_name': 'Workflow instance', + 'verbose_name_plural': 'Workflow instances' + }, ), ] diff --git a/mayan/apps/document_states/migrations/0012_auto_20180823_2353.py b/mayan/apps/document_states/migrations/0012_auto_20180823_2353.py index 67cbd21bc7..0100c31874 100644 --- a/mayan/apps/document_states/migrations/0012_auto_20180823_2353.py +++ b/mayan/apps/document_states/migrations/0012_auto_20180823_2353.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.11 on 2018-08-23 23:53 from __future__ import unicode_literals from django.db import migrations, models @@ -15,6 +13,9 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='workflowstateaction', name='label', - field=models.CharField(help_text='A simple identifier for this action.', max_length=255, verbose_name='Label'), + field=models.CharField( + help_text='A simple identifier for this action.', + max_length=255, verbose_name='Label' + ), ), ] diff --git a/mayan/apps/document_states/models.py b/mayan/apps/document_states/models.py index b228cbc86f..e354b287f5 100644 --- a/mayan/apps/document_states/models.py +++ b/mayan/apps/document_states/models.py @@ -9,8 +9,8 @@ from graphviz import Digraph from django.conf import settings from django.core import serializers -from django.core.files.base import ContentFile from django.core.exceptions import PermissionDenied, ValidationError +from django.core.files.base import ContentFile from django.db import IntegrityError, models from django.db.models import F, Max, Q from django.urls import reverse @@ -25,8 +25,8 @@ from mayan.apps.events.models import StoredEventType from .error_logs import error_log_state_actions from .literals import ( - WORKFLOW_ACTION_WHEN_CHOICES, WORKFLOW_ACTION_ON_ENTRY, - WORKFLOW_ACTION_ON_EXIT + WORKFLOW_ACTION_ON_ENTRY, WORKFLOW_ACTION_ON_EXIT, + WORKFLOW_ACTION_WHEN_CHOICES ) from .managers import WorkflowManager from .permissions import permission_workflow_transition diff --git a/mayan/apps/document_states/queues.py b/mayan/apps/document_states/queues.py index ec1f213aef..753a612421 100644 --- a/mayan/apps/document_states/queues.py +++ b/mayan/apps/document_states/queues.py @@ -4,7 +4,6 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.task_manager.classes import CeleryQueue - queue_document_states = CeleryQueue( name='document_states', label=_('Document states') ) diff --git a/mayan/apps/document_states/tests/mixins.py b/mayan/apps/document_states/tests/mixins.py index 2ffe997535..8ce2280cf4 100644 --- a/mayan/apps/document_states/tests/mixins.py +++ b/mayan/apps/document_states/tests/mixins.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals from ..models import Workflow, WorkflowState, WorkflowTransition from .literals import ( - TEST_WORKFLOW_INITIAL_STATE_LABEL, TEST_WORKFLOW_INITIAL_STATE_COMPLETION, + TEST_WORKFLOW_INITIAL_STATE_COMPLETION, TEST_WORKFLOW_INITIAL_STATE_LABEL, TEST_WORKFLOW_INTERNAL_NAME, TEST_WORKFLOW_LABEL, - TEST_WORKFLOW_STATE_LABEL, TEST_WORKFLOW_STATE_COMPLETION, + TEST_WORKFLOW_STATE_COMPLETION, TEST_WORKFLOW_STATE_LABEL, TEST_WORKFLOW_TRANSITION_LABEL, TEST_WORKFLOW_TRANSITION_LABEL_2 ) diff --git a/mayan/apps/document_states/tests/test_api.py b/mayan/apps/document_states/tests/test_api.py index 9766d17aac..0d9026d7ff 100644 --- a/mayan/apps/document_states/tests/test_api.py +++ b/mayan/apps/document_states/tests/test_api.py @@ -19,12 +19,12 @@ from ..permissions import ( ) from .literals import ( - TEST_WORKFLOW_INTERNAL_NAME, TEST_WORKFLOW_INITIAL_STATE_COMPLETION, - TEST_WORKFLOW_INITIAL_STATE_LABEL, - TEST_WORKFLOW_INSTANCE_LOG_ENTRY_COMMENT, TEST_WORKFLOW_LABEL, - TEST_WORKFLOW_LABEL_EDITED, TEST_WORKFLOW_STATE_COMPLETION, - TEST_WORKFLOW_STATE_LABEL, TEST_WORKFLOW_STATE_LABEL_EDITED, - TEST_WORKFLOW_TRANSITION_LABEL, TEST_WORKFLOW_TRANSITION_LABEL_EDITED + TEST_WORKFLOW_INITIAL_STATE_COMPLETION, TEST_WORKFLOW_INITIAL_STATE_LABEL, + TEST_WORKFLOW_INSTANCE_LOG_ENTRY_COMMENT, TEST_WORKFLOW_INTERNAL_NAME, + TEST_WORKFLOW_LABEL, TEST_WORKFLOW_LABEL_EDITED, + TEST_WORKFLOW_STATE_COMPLETION, TEST_WORKFLOW_STATE_LABEL, + TEST_WORKFLOW_STATE_LABEL_EDITED, TEST_WORKFLOW_TRANSITION_LABEL, + TEST_WORKFLOW_TRANSITION_LABEL_EDITED ) diff --git a/mayan/apps/document_states/tests/test_models.py b/mayan/apps/document_states/tests/test_models.py index c047441fa8..7eb56142d7 100644 --- a/mayan/apps/document_states/tests/test_models.py +++ b/mayan/apps/document_states/tests/test_models.py @@ -3,19 +3,19 @@ from __future__ import unicode_literals from django.test import override_settings from mayan.apps.common.tests import BaseTestCase +from mayan.apps.document_indexing.models import Index, IndexInstanceNode from mayan.apps.documents.models import DocumentType from mayan.apps.documents.tests import ( - TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL + TEST_DOCUMENT_TYPE_LABEL, TEST_SMALL_DOCUMENT_PATH ) -from mayan.apps.document_indexing.models import Index, IndexInstanceNode from ..models import Workflow from .literals import ( TEST_INDEX_LABEL, TEST_INDEX_TEMPLATE_METADATA_EXPRESSION, - TEST_WORKFLOW_INTERNAL_NAME, TEST_WORKFLOW_INITIAL_STATE_LABEL, - TEST_WORKFLOW_INITIAL_STATE_COMPLETION, TEST_WORKFLOW_LABEL, - TEST_WORKFLOW_STATE_LABEL, TEST_WORKFLOW_STATE_COMPLETION, + TEST_WORKFLOW_INITIAL_STATE_COMPLETION, TEST_WORKFLOW_INITIAL_STATE_LABEL, + TEST_WORKFLOW_INTERNAL_NAME, TEST_WORKFLOW_LABEL, + TEST_WORKFLOW_STATE_COMPLETION, TEST_WORKFLOW_STATE_LABEL, TEST_WORKFLOW_TRANSITION_LABEL ) diff --git a/mayan/apps/document_states/tests/test_views.py b/mayan/apps/document_states/tests/test_views.py index ef1c94547e..0b40454a27 100644 --- a/mayan/apps/document_states/tests/test_views.py +++ b/mayan/apps/document_states/tests/test_views.py @@ -2,22 +2,22 @@ from __future__ import unicode_literals from mayan.apps.common.tests import GenericViewTestCase from mayan.apps.documents.tests import ( - GenericDocumentViewTestCase, TEST_SMALL_DOCUMENT_PATH + TEST_SMALL_DOCUMENT_PATH, GenericDocumentViewTestCase ) from ..models import Workflow, WorkflowState, WorkflowTransition from ..permissions import ( permission_workflow_create, permission_workflow_delete, - permission_workflow_edit, permission_workflow_view, - permission_workflow_tools, permission_workflow_transition + permission_workflow_edit, permission_workflow_tools, + permission_workflow_transition, permission_workflow_view ) from .literals import ( - TEST_WORKFLOW_INITIAL_STATE_LABEL, TEST_WORKFLOW_INITIAL_STATE_COMPLETION, + TEST_WORKFLOW_INITIAL_STATE_COMPLETION, TEST_WORKFLOW_INITIAL_STATE_LABEL, TEST_WORKFLOW_INTERNAL_NAME, TEST_WORKFLOW_LABEL, - TEST_WORKFLOW_LABEL_EDITED, TEST_WORKFLOW_STATE_LABEL, - TEST_WORKFLOW_STATE_LABEL_EDITED, TEST_WORKFLOW_STATE_COMPLETION, - TEST_WORKFLOW_TRANSITION_LABEL, TEST_WORKFLOW_TRANSITION_LABEL_EDITED, + TEST_WORKFLOW_LABEL_EDITED, TEST_WORKFLOW_STATE_COMPLETION, + TEST_WORKFLOW_STATE_LABEL, TEST_WORKFLOW_STATE_LABEL_EDITED, + TEST_WORKFLOW_TRANSITION_LABEL, TEST_WORKFLOW_TRANSITION_LABEL_EDITED ) from .mixins import WorkflowTestMixin diff --git a/mayan/apps/document_states/urls.py b/mayan/apps/document_states/urls.py index 4b7eeb9fad..bb36b6fda5 100644 --- a/mayan/apps/document_states/urls.py +++ b/mayan/apps/document_states/urls.py @@ -5,10 +5,10 @@ from django.conf.urls import url from .api_views import ( APIDocumentTypeWorkflowListView, APIWorkflowDocumentTypeList, APIWorkflowDocumentTypeView, APIWorkflowImageView, - APIWorkflowInstanceListView, APIWorkflowInstanceView, - APIWorkflowInstanceLogEntryListView, APIWorkflowListView, - APIWorkflowStateListView, APIWorkflowStateView, - APIWorkflowTransitionListView, APIWorkflowTransitionView, APIWorkflowView + APIWorkflowInstanceListView, APIWorkflowInstanceLogEntryListView, + APIWorkflowInstanceView, APIWorkflowListView, APIWorkflowStateListView, + APIWorkflowStateView, APIWorkflowTransitionListView, + APIWorkflowTransitionView, APIWorkflowView ) from .views import ( DocumentWorkflowInstanceListView, SetupWorkflowCreateView, @@ -18,13 +18,13 @@ from .views import ( SetupWorkflowStateActionEditView, SetupWorkflowStateActionListView, SetupWorkflowStateActionSelectionView, SetupWorkflowStateCreateView, SetupWorkflowStateDeleteView, SetupWorkflowStateEditView, - SetupWorkflowStateListView, SetupWorkflowTransitionListView, - SetupWorkflowTransitionCreateView, SetupWorkflowTransitionDeleteView, - SetupWorkflowTransitionEditView, + SetupWorkflowStateListView, SetupWorkflowTransitionCreateView, + SetupWorkflowTransitionDeleteView, SetupWorkflowTransitionEditView, + SetupWorkflowTransitionListView, SetupWorkflowTransitionTriggerEventListView, ToolLaunchAllWorkflows, WorkflowDocumentListView, WorkflowInstanceDetailView, WorkflowInstanceTransitionView, WorkflowListView, WorkflowPreviewView, - WorkflowStateDocumentListView, WorkflowStateListView, + WorkflowStateDocumentListView, WorkflowStateListView ) urlpatterns = [ diff --git a/mayan/apps/document_states/views.py b/mayan/apps/document_states/views.py index 545f033a58..0d5bc54741 100644 --- a/mayan/apps/document_states/views.py +++ b/mayan/apps/document_states/views.py @@ -32,18 +32,17 @@ from .icons import ( icon_workflow_transition ) from .links import ( - link_setup_workflow_create, link_setup_workflow_state_create, - link_setup_workflow_state_action_selection, - link_setup_workflow_transition_create + link_setup_workflow_create, link_setup_workflow_state_action_selection, + link_setup_workflow_state_create, link_setup_workflow_transition_create ) from .models import ( - Workflow, WorkflowInstance, WorkflowState, WorkflowStateAction, - WorkflowTransition, WorkflowRuntimeProxy, WorkflowStateRuntimeProxy, + Workflow, WorkflowInstance, WorkflowRuntimeProxy, WorkflowState, + WorkflowStateAction, WorkflowStateRuntimeProxy, WorkflowTransition ) from .permissions import ( permission_workflow_create, permission_workflow_delete, permission_workflow_edit, permission_workflow_tools, - permission_workflow_view, + permission_workflow_view ) from .tasks import task_launch_all_workflows diff --git a/mayan/apps/document_states/workflow_actions.py b/mayan/apps/document_states/workflow_actions.py index 7ea68c8a37..65ad0a3433 100644 --- a/mayan/apps/document_states/workflow_actions.py +++ b/mayan/apps/document_states/workflow_actions.py @@ -1,7 +1,7 @@ from __future__ import absolute_import, unicode_literals -import logging import json +import logging from jinja2 import Template import requests diff --git a/mayan/apps/dynamic_search/classes.py b/mayan/apps/dynamic_search/classes.py index 56b7487ca9..a831121a5a 100644 --- a/mayan/apps/dynamic_search/classes.py +++ b/mayan/apps/dynamic_search/classes.py @@ -9,9 +9,8 @@ from django.utils.module_loading import import_string from django.utils.translation import ugettext as _ from .literals import ( - QUERY_OPERATION_AND, QUERY_OPERATION_OR, TERM_OPERATION_OR, - TERM_OPERATIONS, TERM_QUOTES, TERM_NEGATION_CHARACTER, - TERM_SPACE_CHARACTER + QUERY_OPERATION_AND, QUERY_OPERATION_OR, TERM_NEGATION_CHARACTER, + TERM_OPERATION_OR, TERM_OPERATIONS, TERM_QUOTES, TERM_SPACE_CHARACTER ) from .settings import setting_limit diff --git a/mayan/apps/dynamic_search/migrations/0001_initial.py b/mayan/apps/dynamic_search/migrations/0001_initial.py index 8a48caddfa..8b2c1e0883 100644 --- a/mayan/apps/dynamic_search/migrations/0001_initial.py +++ b/mayan/apps/dynamic_search/migrations/0001_initial.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/dynamic_search/migrations/0002_auto_20150920_0202.py b/mayan/apps/dynamic_search/migrations/0002_auto_20150920_0202.py index 9822bce45d..8f7c3520c3 100644 --- a/mayan/apps/dynamic_search/migrations/0002_auto_20150920_0202.py +++ b/mayan/apps/dynamic_search/migrations/0002_auto_20150920_0202.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/dynamic_search/migrations/0003_auto_20161028_0707.py b/mayan/apps/dynamic_search/migrations/0003_auto_20161028_0707.py index 41d34f3e20..59914768d4 100644 --- a/mayan/apps/dynamic_search/migrations/0003_auto_20161028_0707.py +++ b/mayan/apps/dynamic_search/migrations/0003_auto_20161028_0707.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.db import migrations diff --git a/mayan/apps/dynamic_search/settings.py b/mayan/apps/dynamic_search/settings.py index e3e3dd928c..eaa47d5036 100644 --- a/mayan/apps/dynamic_search/settings.py +++ b/mayan/apps/dynamic_search/settings.py @@ -4,7 +4,6 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.smart_settings import Namespace - namespace = Namespace(name='dynamic_search', label=_('Search')) setting_limit = namespace.add_setting( global_name='SEARCH_LIMIT', default=100, diff --git a/mayan/apps/dynamic_search/tests/test_api.py b/mayan/apps/dynamic_search/tests/test_api.py index 20da76e806..a5a4aca52d 100644 --- a/mayan/apps/dynamic_search/tests/test_api.py +++ b/mayan/apps/dynamic_search/tests/test_api.py @@ -5,8 +5,8 @@ from django.urls import reverse from rest_framework import status -from mayan.apps.documents.search import document_search from mayan.apps.documents.permissions import permission_document_view +from mayan.apps.documents.search import document_search from mayan.apps.documents.tests import DocumentTestMixin from mayan.apps.rest_api.tests import BaseAPITestCase diff --git a/mayan/apps/dynamic_search/tests/test_models.py b/mayan/apps/dynamic_search/tests/test_models.py index 08f77faf07..c151ba9656 100644 --- a/mayan/apps/dynamic_search/tests/test_models.py +++ b/mayan/apps/dynamic_search/tests/test_models.py @@ -5,7 +5,7 @@ from django.test import override_settings from mayan.apps.common.tests import BaseTestCase from mayan.apps.documents.search import document_search from mayan.apps.documents.tests import ( - DocumentTestMixin, TEST_DOCUMENT_FILENAME, TEST_SMALL_DOCUMENT_FILENAME + TEST_DOCUMENT_FILENAME, TEST_SMALL_DOCUMENT_FILENAME, DocumentTestMixin ) diff --git a/mayan/apps/dynamic_search/tests/test_views.py b/mayan/apps/dynamic_search/tests/test_views.py index 1af5f236d3..b43205f06d 100644 --- a/mayan/apps/dynamic_search/tests/test_views.py +++ b/mayan/apps/dynamic_search/tests/test_views.py @@ -5,7 +5,9 @@ from django.test import override_settings from mayan.apps.common.tests import GenericViewTestCase from mayan.apps.documents.models import DocumentType from mayan.apps.documents.search import document_search -from mayan.apps.documents.tests import TEST_DOCUMENT_TYPE_LABEL, TEST_SMALL_DOCUMENT_PATH +from mayan.apps.documents.tests import ( + TEST_DOCUMENT_TYPE_LABEL, TEST_SMALL_DOCUMENT_PATH +) @override_settings(OCR_AUTO_OCR=False) diff --git a/mayan/apps/dynamic_search/urls.py b/mayan/apps/dynamic_search/urls.py index 4558a73d2c..c19b27a663 100644 --- a/mayan/apps/dynamic_search/urls.py +++ b/mayan/apps/dynamic_search/urls.py @@ -2,12 +2,8 @@ from __future__ import unicode_literals from django.conf.urls import url -from .api_views import ( - APIAdvancedSearchView, APISearchModelList, APISearchView -) -from .views import ( - AdvancedSearchView, ResultsView, SearchAgainView, SearchView -) +from .api_views import APIAdvancedSearchView, APISearchModelList, APISearchView +from .views import AdvancedSearchView, ResultsView, SearchAgainView, SearchView urlpatterns = [ url(r'^(?P[\.\w]+)/$', SearchView.as_view(), name='search'), diff --git a/mayan/apps/dynamic_search/views.py b/mayan/apps/dynamic_search/views.py index 1d1e9027ed..6fc08a179e 100644 --- a/mayan/apps/dynamic_search/views.py +++ b/mayan/apps/dynamic_search/views.py @@ -8,7 +8,7 @@ from django.views.generic.base import RedirectView from mayan.apps.common.generics import SimpleView, SingleObjectListView -from .forms import SearchForm, AdvancedSearchForm +from .forms import AdvancedSearchForm, SearchForm from .icons import icon_search_submit from .mixins import SearchModelMixin from .settings import setting_limit diff --git a/mayan/apps/events/api_views.py b/mayan/apps/events/api_views.py index c5513f0ff3..dfc841fe24 100644 --- a/mayan/apps/events/api_views.py +++ b/mayan/apps/events/api_views.py @@ -14,7 +14,7 @@ from .classes import EventType, EventTypeNamespace from .models import Notification from .permissions import permission_events_view from .serializers import ( - EventSerializer, EventTypeSerializer, EventTypeNamespaceSerializer, + EventSerializer, EventTypeNamespaceSerializer, EventTypeSerializer, NotificationSerializer ) diff --git a/mayan/apps/events/apps.py b/mayan/apps/events/apps.py index 0e1d7539de..e8d5860aa8 100644 --- a/mayan/apps/events/apps.py +++ b/mayan/apps/events/apps.py @@ -11,12 +11,12 @@ from mayan.apps.common import ( from mayan.apps.common.widgets import TwoStateWidget from mayan.apps.navigation import SourceColumn -from .links import ( - link_events_list, link_event_types_subscriptions_list, - link_notification_mark_read, link_notification_mark_read_all, - link_user_events, link_user_notifications_list, -) from .licenses import * # NOQA +from .links import ( + link_event_types_subscriptions_list, link_events_list, + link_notification_mark_read, link_notification_mark_read_all, + link_user_events, link_user_notifications_list +) from .widgets import event_object_link, event_type_link, event_user_link diff --git a/mayan/apps/events/links.py b/mayan/apps/events/links.py index f7e0394ce9..39880bcecf 100644 --- a/mayan/apps/events/links.py +++ b/mayan/apps/events/links.py @@ -6,9 +6,9 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.navigation import Link from .icons import ( - icon_events_list, icon_events_for_object, - icon_event_types_subscriptions_list, - icon_events_user_list, icon_object_event_types_user_subcriptions_list, + icon_event_types_subscriptions_list, icon_events_for_object, + icon_events_list, icon_events_user_list, + icon_object_event_types_user_subcriptions_list, icon_user_notifications_list ) from .permissions import permission_events_view diff --git a/mayan/apps/events/migrations/0001_initial.py b/mayan/apps/events/migrations/0001_initial.py index 07de839d6f..35c7ccdb30 100644 --- a/mayan/apps/events/migrations/0001_initial.py +++ b/mayan/apps/events/migrations/0001_initial.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/events/migrations/0002_eventsubscription.py b/mayan/apps/events/migrations/0002_eventsubscription.py index 8c84935e1a..07c0d818cb 100644 --- a/mayan/apps/events/migrations/0002_eventsubscription.py +++ b/mayan/apps/events/migrations/0002_eventsubscription.py @@ -1,10 +1,8 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-07-29 07:04 from __future__ import unicode_literals +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): @@ -18,9 +16,25 @@ class Migration(migrations.Migration): migrations.CreateModel( name='EventSubscription', fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('event_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subscriptions', to='events.EventType', verbose_name='Event type')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='User')), + ( + 'id', models.AutoField( + auto_created=True, primary_key=True, serialize=False, + verbose_name='ID' + ) + ), + ( + 'event_type', models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='subscriptions', to='events.EventType', + verbose_name='Event type' + ) + ), + ( + 'user', models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, verbose_name='User' + ) + ), ], options={ 'verbose_name': 'Event subscription', diff --git a/mayan/apps/events/migrations/0003_notification.py b/mayan/apps/events/migrations/0003_notification.py index 343ac7b91c..1b0f97b976 100644 --- a/mayan/apps/events/migrations/0003_notification.py +++ b/mayan/apps/events/migrations/0003_notification.py @@ -1,10 +1,8 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-07-29 07:23 from __future__ import unicode_literals +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): @@ -19,10 +17,32 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Notification', fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('read', models.BooleanField(default=False, verbose_name='Read')), - ('action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notifications', to='actstream.Action', verbose_name='Action')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notifications', to=settings.AUTH_USER_MODEL, verbose_name='User')), + ( + 'id', models.AutoField( + auto_created=True, primary_key=True, serialize=False, + verbose_name='ID' + ) + ), + ( + 'read', models.BooleanField( + default=False, verbose_name='Read' + ) + ), + ( + 'action', models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='notifications', to='actstream.Action', + verbose_name='Action' + ) + ), + ( + 'user', models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='notifications', + to=settings.AUTH_USER_MODEL, + verbose_name='User' + ) + ), ], options={ 'verbose_name': 'Notification', diff --git a/mayan/apps/events/migrations/0004_auto_20170731_0423.py b/mayan/apps/events/migrations/0004_auto_20170731_0423.py index af9d7379b0..658ff3a4a7 100644 --- a/mayan/apps/events/migrations/0004_auto_20170731_0423.py +++ b/mayan/apps/events/migrations/0004_auto_20170731_0423.py @@ -1,10 +1,8 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-07-31 04:23 from __future__ import unicode_literals +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): @@ -20,7 +18,10 @@ class Migration(migrations.Migration): ), migrations.AlterModelOptions( name='storedeventtype', - options={'verbose_name': 'Stored event type', 'verbose_name_plural': 'Stored event types'}, + options={ + 'verbose_name': 'Stored event type', + 'verbose_name_plural': 'Stored event types' + }, ), migrations.RemoveField( model_name='eventsubscription', @@ -29,12 +30,20 @@ class Migration(migrations.Migration): migrations.AddField( model_name='eventsubscription', name='stored_event_type', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='event_subscriptions', to='events.StoredEventType', verbose_name='Event type'), + field=models.ForeignKey( + default=1, on_delete=django.db.models.deletion.CASCADE, + related_name='event_subscriptions', + to='events.StoredEventType', verbose_name='Event type' + ), preserve_default=False, ), migrations.AlterField( model_name='eventsubscription', name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='event_subscriptions', to=settings.AUTH_USER_MODEL, verbose_name='User'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='event_subscriptions', + to=settings.AUTH_USER_MODEL, verbose_name='User' + ), ), ] diff --git a/mayan/apps/events/migrations/0006_objecteventsubscription.py b/mayan/apps/events/migrations/0006_objecteventsubscription.py index 15094ce433..0853fe643c 100644 --- a/mayan/apps/events/migrations/0006_objecteventsubscription.py +++ b/mayan/apps/events/migrations/0006_objecteventsubscription.py @@ -1,10 +1,8 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-07-31 06:40 from __future__ import unicode_literals +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): @@ -19,11 +17,34 @@ class Migration(migrations.Migration): migrations.CreateModel( name='ObjectEventSubscription', fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ( + 'id', models.AutoField( + auto_created=True, primary_key=True, serialize=False, + verbose_name='ID' + ) + ), ('object_id', models.PositiveIntegerField()), - ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), - ('stored_event_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='object_subscriptions', to='events.StoredEventType', verbose_name='Event type')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='object_subscriptions', to=settings.AUTH_USER_MODEL, verbose_name='User')), + ( + 'content_type', models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to='contenttypes.ContentType' + ) + ), + ( + 'stored_event_type', models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='object_subscriptions', + to='events.StoredEventType', + verbose_name='Event type' + ) + ), + ( + 'user', models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='object_subscriptions', + to=settings.AUTH_USER_MODEL, verbose_name='User' + ) + ), ], options={ 'verbose_name': 'Object event subscription', diff --git a/mayan/apps/events/migrations/0007_auto_20170802_0823.py b/mayan/apps/events/migrations/0007_auto_20170802_0823.py index 444b27388e..1004618065 100644 --- a/mayan/apps/events/migrations/0007_auto_20170802_0823.py +++ b/mayan/apps/events/migrations/0007_auto_20170802_0823.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2017-08-02 08:23 from __future__ import unicode_literals from django.db import migrations @@ -14,6 +12,10 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='notification', - options={'ordering': ('-action__timestamp',), 'verbose_name': 'Notification', 'verbose_name_plural': 'Notifications'}, + options={ + 'ordering': ('-action__timestamp',), + 'verbose_name': 'Notification', + 'verbose_name_plural': 'Notifications' + }, ), ] diff --git a/mayan/apps/events/migrations/0008_auto_20180315_0029.py b/mayan/apps/events/migrations/0008_auto_20180315_0029.py index cce91656c5..bd73581f8e 100644 --- a/mayan/apps/events/migrations/0008_auto_20180315_0029.py +++ b/mayan/apps/events/migrations/0008_auto_20180315_0029.py @@ -1,9 +1,7 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-03-15 00:29 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): @@ -16,6 +14,10 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='eventsubscription', name='stored_event_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='event_subscriptions', to='events.StoredEventType', verbose_name='Event type'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='event_subscriptions', + to='events.StoredEventType', verbose_name='Event type' + ), ), ] diff --git a/mayan/apps/events/models.py b/mayan/apps/events/models.py index af9988d160..37c86b6b6d 100644 --- a/mayan/apps/events/models.py +++ b/mayan/apps/events/models.py @@ -10,9 +10,7 @@ from django.utils.translation import ugettext_lazy as _ from actstream.models import Action from .classes import EventType -from .managers import ( - EventSubscriptionManager, ObjectEventSubscriptionManager -) +from .managers import EventSubscriptionManager, ObjectEventSubscriptionManager @python_2_unicode_compatible diff --git a/mayan/apps/linking/apps.py b/mayan/apps/linking/apps.py index 5bdd79b8c1..2d8f8b319a 100644 --- a/mayan/apps/linking/apps.py +++ b/mayan/apps/linking/apps.py @@ -5,7 +5,9 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.acls import ModelPermission from mayan.apps.acls.links import link_acl_list -from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view +from mayan.apps.acls.permissions import ( + permission_acl_edit, permission_acl_view +) from mayan.apps.common import ( MayanAppConfig, menu_facet, menu_list_facet, menu_object, menu_secondary, menu_setup, menu_sidebar @@ -14,9 +16,9 @@ from mayan.apps.common.widgets import TwoStateWidget from mayan.apps.navigation import SourceColumn from .links import ( - link_smart_link_create, link_smart_link_condition_create, - link_smart_link_condition_delete, link_smart_link_condition_edit, - link_smart_link_condition_list, link_smart_link_delete, + link_smart_link_condition_create, link_smart_link_condition_delete, + link_smart_link_condition_edit, link_smart_link_condition_list, + link_smart_link_create, link_smart_link_delete, link_smart_link_document_types, link_smart_link_edit, link_smart_link_instance_view, link_smart_link_instances_for_document, link_smart_link_list, link_smart_link_setup diff --git a/mayan/apps/linking/migrations/0001_initial.py b/mayan/apps/linking/migrations/0001_initial.py index a6757b5da5..8c0983e564 100644 --- a/mayan/apps/linking/migrations/0001_initial.py +++ b/mayan/apps/linking/migrations/0001_initial.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/linking/migrations/0002_resolvedsmartlink.py b/mayan/apps/linking/migrations/0002_resolvedsmartlink.py index 4be3b71bd8..e05c9b4df7 100644 --- a/mayan/apps/linking/migrations/0002_resolvedsmartlink.py +++ b/mayan/apps/linking/migrations/0002_resolvedsmartlink.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.db import migrations diff --git a/mayan/apps/linking/migrations/0003_auto_20150708_0318.py b/mayan/apps/linking/migrations/0003_auto_20150708_0318.py index a330b53136..ed42a710ce 100644 --- a/mayan/apps/linking/migrations/0003_auto_20150708_0318.py +++ b/mayan/apps/linking/migrations/0003_auto_20150708_0318.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.db import migrations diff --git a/mayan/apps/linking/migrations/0004_auto_20150708_0320.py b/mayan/apps/linking/migrations/0004_auto_20150708_0320.py index c4462144c4..df40d0817f 100644 --- a/mayan/apps/linking/migrations/0004_auto_20150708_0320.py +++ b/mayan/apps/linking/migrations/0004_auto_20150708_0320.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/linking/migrations/0005_auto_20150729_2344.py b/mayan/apps/linking/migrations/0005_auto_20150729_2344.py index 4cde916d9c..4b5029ce68 100644 --- a/mayan/apps/linking/migrations/0005_auto_20150729_2344.py +++ b/mayan/apps/linking/migrations/0005_auto_20150729_2344.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/linking/migrations/0006_auto_20180402_0339.py b/mayan/apps/linking/migrations/0006_auto_20180402_0339.py index f8f5f8b0bc..8f6cad68cc 100644 --- a/mayan/apps/linking/migrations/0006_auto_20180402_0339.py +++ b/mayan/apps/linking/migrations/0006_auto_20180402_0339.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.11 on 2018-04-02 03:39 from __future__ import unicode_literals from django.db import migrations, models @@ -14,11 +12,16 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='smartlink', - options={'ordering': ('label',), 'verbose_name': 'Smart link', 'verbose_name_plural': 'Smart links'}, + options={ + 'ordering': ('label',), 'verbose_name': 'Smart link', + 'verbose_name_plural': 'Smart links' + }, ), migrations.AlterField( model_name='smartlink', name='label', - field=models.CharField(db_index=True, max_length=96, verbose_name='Label'), + field=models.CharField( + db_index=True, max_length=96, verbose_name='Label' + ), ), ] diff --git a/mayan/apps/linking/migrations/0007_auto_20180823_2353.py b/mayan/apps/linking/migrations/0007_auto_20180823_2353.py index 9482d31d15..3c8da9b150 100644 --- a/mayan/apps/linking/migrations/0007_auto_20180823_2353.py +++ b/mayan/apps/linking/migrations/0007_auto_20180823_2353.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.11 on 2018-08-23 23:53 from __future__ import unicode_literals from django.db import migrations, models @@ -15,11 +13,22 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='smartlink', name='dynamic_label', - field=models.CharField(blank=True, help_text="Enter a template to render. Use Django's default templating language (https://docs.djangoproject.com/en/1.11/ref/templates/builtins/). The {{ document }} context variable is available.", max_length=96, verbose_name='Dynamic label'), + field=models.CharField( + blank=True, help_text="Enter a template to render. Use " + "Django's default templating language " + "(https://docs.djangoproject.com/en/1.11/ref/templates/" + "builtins/). The {{ document }} context variable " + "is available.", max_length=96, verbose_name='Dynamic label' + ), ), migrations.AlterField( model_name='smartlinkcondition', name='expression', - field=models.TextField(help_text="Enter a template to render. Use Django's default templating language (https://docs.djangoproject.com/en/1.11/ref/templates/builtins/). The {{ document }} context variable is available.", verbose_name='Expression'), + field=models.TextField( + help_text="Enter a template to render. Use Django's default " + "templating language (https://docs.djangoproject.com/en/" + "1.11/ref/templates/builtins/). The {{ document }} context " + "variable is available.", verbose_name='Expression' + ), ), ] diff --git a/mayan/apps/linking/tests/test_api.py b/mayan/apps/linking/tests/test_api.py index fa92ffdb83..b36cae8cc5 100644 --- a/mayan/apps/linking/tests/test_api.py +++ b/mayan/apps/linking/tests/test_api.py @@ -19,11 +19,11 @@ from ..permissions import ( ) from .literals import ( - TEST_SMART_LINK_CONDITION_FOREIGN_DOCUMENT_DATA, TEST_SMART_LINK_CONDITION_EXPRESSION, TEST_SMART_LINK_CONDITION_EXPRESSION_EDITED, + TEST_SMART_LINK_CONDITION_FOREIGN_DOCUMENT_DATA, TEST_SMART_LINK_CONDITION_OPERATOR, TEST_SMART_LINK_DYNAMIC_LABEL, - TEST_SMART_LINK_LABEL_EDITED, TEST_SMART_LINK_LABEL + TEST_SMART_LINK_LABEL, TEST_SMART_LINK_LABEL_EDITED ) diff --git a/mayan/apps/linking/tests/test_models.py b/mayan/apps/linking/tests/test_models.py index 9c91ef5d62..c5fee1a6b9 100644 --- a/mayan/apps/linking/tests/test_models.py +++ b/mayan/apps/linking/tests/test_models.py @@ -6,7 +6,7 @@ from mayan.apps.documents.tests import GenericDocumentTestCase from ..models import SmartLink -from .literals import TEST_SMART_LINK_LABEL, TEST_SMART_LINK_DYNAMIC_LABEL +from .literals import TEST_SMART_LINK_DYNAMIC_LABEL, TEST_SMART_LINK_LABEL @override_settings(OCR_AUTO_OCR=False) diff --git a/mayan/apps/linking/tests/test_views.py b/mayan/apps/linking/tests/test_views.py index 3efce0848a..9a98ff0cdb 100644 --- a/mayan/apps/linking/tests/test_views.py +++ b/mayan/apps/linking/tests/test_views.py @@ -10,8 +10,8 @@ from ..permissions import ( ) from .literals import ( - TEST_SMART_LINK_DYNAMIC_LABEL, TEST_SMART_LINK_LABEL_EDITED, - TEST_SMART_LINK_LABEL + TEST_SMART_LINK_DYNAMIC_LABEL, TEST_SMART_LINK_LABEL, + TEST_SMART_LINK_LABEL_EDITED ) diff --git a/mayan/apps/linking/urls.py b/mayan/apps/linking/urls.py index 46eb35e989..6bdf4f04ca 100644 --- a/mayan/apps/linking/urls.py +++ b/mayan/apps/linking/urls.py @@ -3,15 +3,15 @@ from __future__ import unicode_literals from django.conf.urls import url from .api_views import ( - APIResolvedSmartLinkView, APIResolvedSmartLinkDocumentListView, - APIResolvedSmartLinkListView, APISmartLinkListView, APISmartLinkView, - APISmartLinkConditionListView, APISmartLinkConditionView + APIResolvedSmartLinkDocumentListView, APIResolvedSmartLinkListView, + APIResolvedSmartLinkView, APISmartLinkConditionListView, + APISmartLinkConditionView, APISmartLinkListView, APISmartLinkView ) from .views import ( DocumentSmartLinkListView, ResolvedSmartLinkView, - SetupSmartLinkDocumentTypesView, SmartLinkConditionListView, - SmartLinkConditionCreateView, SmartLinkConditionEditView, - SmartLinkConditionDeleteView, SmartLinkCreateView, SmartLinkDeleteView, + SetupSmartLinkDocumentTypesView, SmartLinkConditionCreateView, + SmartLinkConditionDeleteView, SmartLinkConditionEditView, + SmartLinkConditionListView, SmartLinkCreateView, SmartLinkDeleteView, SmartLinkEditView, SmartLinkListView ) diff --git a/mayan/apps/linking/views.py b/mayan/apps/linking/views.py index f7d99baa17..56d7bd961d 100644 --- a/mayan/apps/linking/views.py +++ b/mayan/apps/linking/views.py @@ -19,8 +19,8 @@ from mayan.apps.documents.permissions import permission_document_view from mayan.apps.documents.views import DocumentListView from .forms import SmartLinkConditionForm, SmartLinkForm -from .icons import icon_smart_link_setup, icon_smart_link_condition -from .links import link_smart_link_create, link_smart_link_condition_create +from .icons import icon_smart_link_condition, icon_smart_link_setup +from .links import link_smart_link_condition_create, link_smart_link_create from .models import ResolvedSmartLink, SmartLink, SmartLinkCondition from .permissions import ( permission_smart_link_create, permission_smart_link_delete, diff --git a/mayan/apps/motd/apps.py b/mayan/apps/motd/apps.py index a660006d8c..cbdb7d5271 100644 --- a/mayan/apps/motd/apps.py +++ b/mayan/apps/motd/apps.py @@ -6,7 +6,9 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.acls import ModelPermission from mayan.apps.acls.links import link_acl_list -from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view +from mayan.apps.acls.permissions import ( + permission_acl_edit, permission_acl_view +) from mayan.apps.common import ( MayanAppConfig, menu_list_facet, menu_object, menu_secondary, menu_setup ) diff --git a/mayan/apps/motd/links.py b/mayan/apps/motd/links.py index b0a8133baa..92e94542ca 100644 --- a/mayan/apps/motd/links.py +++ b/mayan/apps/motd/links.py @@ -10,7 +10,6 @@ from .permissions import ( permission_message_edit, permission_message_view ) - link_message_create = Link( icon_class=icon_message_create, permissions=(permission_message_create,), text=_('Create message'), view='motd:message_create'