matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Multiple apps: Sort imports and minor style fixes

Browse Source 
Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2018-12-06 16:38:24 -04:00
parent 4d84b5f28f
commit 46cd7353dc
117 changed files with 500 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mayan/apps/document_comments/apps.py
View File

@@ -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

2
mayan/apps/document_comments/links.py
View File

@@ -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 _

3
mayan/apps/document_comments/migrations/0001_initial.py
View File

@@ -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):

3
mayan/apps/document_comments/migrations/0002_auto_20150729_2144.py
View File

@@ -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):

7
mayan/apps/document_comments/migrations/0003_auto_20150729_2144.py
View File

@@ -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,

3
mayan/apps/document_comments/migrations/0004_auto_20150920_0202.py
View File

@@ -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):

24
mayan/apps/document_indexing/apps.py
View File

@@ -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,

8
mayan/apps/document_indexing/links.py
View File

@@ -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
)

4
mayan/apps/document_indexing/migrations/0001_initial.py
View File

@@ -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

1
mayan/apps/document_indexing/migrations/0002_remove_index_name.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations

1
mayan/apps/document_indexing/migrations/0003_auto_20150708_0101.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations

3
mayan/apps/document_indexing/migrations/0004_auto_20150708_0113.py
View File

@@ -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):

3
mayan/apps/document_indexing/migrations/0005_index_slug.py
View File

@@ -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):

1
mayan/apps/document_indexing/migrations/0006_auto_20150729_0144.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations

3
mayan/apps/document_indexing/migrations/0007_auto_20150729_0152.py
View File

@@ -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):

3
mayan/apps/document_indexing/migrations/0008_auto_20150729_1515.py
View File

@@ -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):

3
mayan/apps/document_indexing/migrations/0009_auto_20150815_0351.py
View File

@@ -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):

1
mayan/apps/document_indexing/migrations/0010_documentindexinstancenode_indexinstance.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations

2
mayan/apps/document_indexing/migrations/0011_auto_20170524_0456.py
View File

@@ -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

22
mayan/apps/document_indexing/migrations/0012_auto_20170530_0728.py
View File

@@ -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'
),
),
]

8
mayan/apps/document_indexing/migrations/0013_auto_20170714_2133.py
View File

@@ -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'
},
),
]

8
mayan/apps/document_indexing/migrations/0014_auto_20180823_2353.py
View File

@@ -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'
),
),
]

5
mayan/apps/document_indexing/models.py
View File

@@ -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__)

4
mayan/apps/document_indexing/tests/test_models.py
View File

@@ -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

4
mayan/apps/document_indexing/urls.py
View File

@@ -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
)

7
mayan/apps/document_indexing/views.py
View File

@@ -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

2
mayan/apps/document_indexing/widgets.py
View File

@@ -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

4
mayan/apps/document_parsing/admin.py
View File

@@ -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)

14
mayan/apps/document_parsing/apps.py
View File

@@ -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
)

3
mayan/apps/document_parsing/forms.py
View File

@@ -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

4
mayan/apps/document_parsing/links.py
View File

@@ -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 (

4
mayan/apps/document_parsing/migrations/0001_initial.py
View File

@@ -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):

4
mayan/apps/document_parsing/migrations/0002_auto_20170827_1617.py
View File

@@ -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):

43
mayan/apps/document_parsing/migrations/0003_documenttypesettings.py
View File

@@ -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',

7
mayan/apps/document_parsing/migrations/0004_auto_20180917_0645.py
View File

@@ -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'
),
),
]

1
mayan/apps/document_parsing/tests/literals.py
View File

@@ -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 %}'

2
mayan/apps/document_parsing/tests/test_api.py
View File

@@ -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

4
mayan/apps/document_parsing/tests/test_events.py
View File

@@ -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
)

2
mayan/apps/document_parsing/tests/test_indexing.py
View File

@@ -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

6
mayan/apps/document_parsing/tests/test_models.py
View File

@@ -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):

4
mayan/apps/document_parsing/tests/test_parsers.py
View File

@@ -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)

4
mayan/apps/document_parsing/tests/test_views.py
View File

@@ -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)

7
mayan/apps/document_parsing/urls.py
View File

@@ -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 = [

3
mayan/apps/document_parsing/views.py
View File

@@ -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,

15
mayan/apps/document_signatures/apps.py
View File

@@ -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

4
mayan/apps/document_signatures/handlers.py
View File

@@ -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
)

2
mayan/apps/document_signatures/migrations/0001_initial.py
View File

@@ -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

9
mayan/apps/document_signatures/migrations/0002_auto_20150608_1902.py
View File

@@ -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,
),

3
mayan/apps/document_signatures/migrations/0003_auto_20160325_0052.py
View File

@@ -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

1
mayan/apps/document_signatures/migrations/0004_auto_20160325_0418.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models

1
mayan/apps/document_signatures/migrations/0005_auto_20160325_0748.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations

5
mayan/apps/document_signatures/migrations/0006_auto_20160326_0616.py
View File

@@ -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'
),
),
]

5
mayan/apps/document_signatures/tests/test_links.py
View File

@@ -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

8
mayan/apps/document_signatures/tests/test_models.py
View File

@@ -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
)

4
mayan/apps/document_signatures/tests/test_views.py
View File

@@ -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

5
mayan/apps/document_signatures/views.py
View File

@@ -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

2
mayan/apps/document_states/api_views.py
View File

@@ -20,7 +20,7 @@ from .permissions import (
)
from .serializers import (
NewWorkflowDocumentTypeSerializer, WorkflowDocumentTypeSerializer,
WorkflowInstanceSerializer, WorkflowInstanceLogEntrySerializer,
WorkflowInstanceLogEntrySerializer, WorkflowInstanceSerializer,
WorkflowSerializer, WorkflowStateSerializer, WorkflowTransitionSerializer,
WritableWorkflowInstanceLogEntrySerializer, WritableWorkflowSerializer,
WritableWorkflowTransitionSerializer

19
mayan/apps/document_states/apps.py
View File

@@ -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,

2
mayan/apps/document_states/classes.py
View File

@@ -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

2
mayan/apps/document_states/links.py
View File

@@ -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(

3
mayan/apps/document_states/migrations/0001_initial.py
View File

@@ -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):

11
mayan/apps/document_states/migrations/0002_workflowstate_completion.py
View File

@@ -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,
),

2
mayan/apps/document_states/migrations/0003_auto_20170325_0447.py
View File

@@ -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

2
mayan/apps/document_states/migrations/0004_workflow_internal_name.py
View File

@@ -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

38
mayan/apps/document_states/migrations/0005_auto_20170803_0638.py
View File

@@ -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'
),
),
]

2
mayan/apps/document_states/migrations/0006_auto_20170803_0651.py
View File

@@ -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

22
mayan/apps/document_states/migrations/0007_auto_20170803_0728.py
View File

@@ -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'
),
),
]

2
mayan/apps/document_states/migrations/0008_auto_20170803_0752.py
View File

@@ -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

54
mayan/apps/document_states/migrations/0009_auto_20170807_0612.py
View File

@@ -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',),

8
mayan/apps/document_states/migrations/0010_auto_20180310_1717.py
View File

@@ -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'
},
),
]

7
mayan/apps/document_states/migrations/0011_auto_20180315_0029.py
View File

@@ -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'
},
),
]

7
mayan/apps/document_states/migrations/0012_auto_20180823_2353.py
View File

@@ -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'
),
),
]

6
mayan/apps/document_states/models.py
View File

@@ -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

1
mayan/apps/document_states/queues.py
View File

@@ -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')
)

4
mayan/apps/document_states/tests/mixins.py
View File

@@ -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
)

12
mayan/apps/document_states/tests/test_api.py
View File

@@ -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
)

10
mayan/apps/document_states/tests/test_models.py
View File

@@ -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
)

14
mayan/apps/document_states/tests/test_views.py
View File

@@ -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

16
mayan/apps/document_states/urls.py
View File

@@ -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 = [

11
mayan/apps/document_states/views.py
View File

@@ -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

2
mayan/apps/document_states/workflow_actions.py
View File

@@ -1,7 +1,7 @@
from __future__ import absolute_import, unicode_literals
import logging
import json
import logging
from jinja2 import Template
import requests

5
mayan/apps/dynamic_search/classes.py
View File

@@ -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

3
mayan/apps/dynamic_search/migrations/0001_initial.py
View File

@@ -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):

3
mayan/apps/dynamic_search/migrations/0002_auto_20150920_0202.py
View File

@@ -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):

1
mayan/apps/dynamic_search/migrations/0003_auto_20161028_0707.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations

1
mayan/apps/dynamic_search/settings.py
View File

@@ -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,

2
mayan/apps/dynamic_search/tests/test_api.py
View File

@@ -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

2
mayan/apps/dynamic_search/tests/test_models.py
View File

@@ -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
)

4
mayan/apps/dynamic_search/tests/test_views.py
View File

@@ -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)

8
mayan/apps/dynamic_search/urls.py
View File

@@ -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<search_model>[\.\w]+)/$', SearchView.as_view(), name='search'),

2
mayan/apps/dynamic_search/views.py
View File

@@ -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

2
mayan/apps/events/api_views.py
View File

@@ -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
)

10
mayan/apps/events/apps.py
View File

@@ -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

6
mayan/apps/events/links.py
View File

@@ -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

3
mayan/apps/events/migrations/0001_initial.py
View File

@@ -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):

26
mayan/apps/events/migrations/0002_eventsubscription.py
View File

@@ -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',

34
mayan/apps/events/migrations/0003_notification.py
View File

@@ -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',

21
mayan/apps/events/migrations/0004_auto_20170731_0423.py
View File

@@ -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'
),
),
]

35
mayan/apps/events/migrations/0006_objecteventsubscription.py
View File

@@ -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',

8
mayan/apps/events/migrations/0007_auto_20170802_0823.py
View File

@@ -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'
},
),
]

Some files were not shown because too many files have changed in this diff Show More