Multiple apps: Sort imports and minor style fixes

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
+1 -3
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)
+7 -7
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
)
+2 -1
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
+2 -2
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 (
@@ -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):
@@ -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):
@@ -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',
@@ -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,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 %}'
@@ -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
@@ -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
)
@@ -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
@@ -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):
@@ -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)
@@ -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)
+3 -4
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 = [
+2 -1
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,