Code cleanups.
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
@@ -49,4 +49,3 @@ icon_support = Icon(
|
||||
icon_tools = Icon(
|
||||
driver_name='fontawesome', symbol='wrench'
|
||||
)
|
||||
|
||||
|
||||
@@ -100,4 +100,3 @@ class UserLocaleProfile(models.Model):
|
||||
def natural_key(self):
|
||||
return self.user.natural_key()
|
||||
natural_key.dependencies = [settings.AUTH_USER_MODEL]
|
||||
|
||||
|
||||
@@ -848,7 +848,6 @@ class DocumentPage(models.Model):
|
||||
|
||||
return final_url.tostr()
|
||||
|
||||
|
||||
def get_combined_transformation_list(self, *args, **kwargs):
|
||||
"""
|
||||
Return a list of transformation containing the server side
|
||||
|
||||
@@ -24,7 +24,7 @@ setting_documentimagecache_storage_arguments = namespace.add_setting(
|
||||
os.path.join(settings.MEDIA_ROOT, 'document_cache')
|
||||
), help_text=_(
|
||||
'Arguments to pass to the DOCUMENT_CACHE_STORAGE_BACKEND.'
|
||||
),quoted=True,
|
||||
), quoted=True,
|
||||
)
|
||||
setting_disable_base_image_cache = namespace.add_setting(
|
||||
global_name='DOCUMENTS_DISABLE_BASE_IMAGE_CACHE', default=False,
|
||||
|
||||
@@ -22,7 +22,6 @@ from documents.signals import post_document_type_change
|
||||
from events import ModelEventType
|
||||
from events.links import (
|
||||
link_events_for_object, link_object_event_types_user_subcriptions_list,
|
||||
link_object_event_types_user_subcriptions_list_with_icon
|
||||
)
|
||||
from events.permissions import permission_events_view
|
||||
from mayan.celery import app
|
||||
@@ -31,8 +30,8 @@ from navigation import SourceColumn
|
||||
from .classes import DocumentMetadataHelper
|
||||
from .events import (
|
||||
event_document_metadata_added, event_document_metadata_edited,
|
||||
event_document_metadata_removed,event_metadata_type_created,
|
||||
event_metadata_type_edited, event_metadata_type_relationship
|
||||
event_document_metadata_removed, event_metadata_type_edited,
|
||||
event_metadata_type_relationship
|
||||
)
|
||||
from .handlers import (
|
||||
handler_index_document, post_document_type_metadata_type_add,
|
||||
|
||||
@@ -32,4 +32,3 @@ event_metadata_type_relationship = namespace.add_event_type(
|
||||
'Metadata type relationship updated'
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
@@ -172,7 +172,6 @@ DocumentMetadataRemoveFormSet = formset_factory(
|
||||
)
|
||||
|
||||
|
||||
|
||||
class DocumentTypeMetadataTypeRelationshipForm(forms.Form):
|
||||
RELATIONSHIP_TYPE_NONE = 'none'
|
||||
RELATIONSHIP_TYPE_OPTIONAL = 'optional'
|
||||
@@ -271,6 +270,7 @@ DocumentTypeMetadataTypeRelationshipFormSetBase = formset_factory(
|
||||
DocumentTypeMetadataTypeRelationshipForm, extra=0
|
||||
)
|
||||
|
||||
|
||||
class DocumentTypeMetadataTypeRelationshipFormSet(DocumentTypeMetadataTypeRelationshipFormSetBase):
|
||||
def __init__(self, *args, **kwargs):
|
||||
_user = kwargs.pop('_user')
|
||||
|
||||
@@ -5,7 +5,7 @@ import shlex
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.db import models
|
||||
from django.template import Context, Template
|
||||
from django.urls import reverse, reverse_lazy
|
||||
from django.urls import reverse
|
||||
from django.utils.encoding import force_text, python_2_unicode_compatible
|
||||
from django.utils.module_loading import import_string
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
@@ -15,7 +15,7 @@ from documents.models import Document, DocumentType
|
||||
from .classes import MetadataLookup
|
||||
from .events import (
|
||||
event_document_metadata_added, event_document_metadata_edited,
|
||||
event_document_metadata_removed,event_metadata_type_created,
|
||||
event_document_metadata_removed, event_metadata_type_created,
|
||||
event_metadata_type_edited, event_metadata_type_relationship
|
||||
)
|
||||
from .managers import DocumentTypeMetadataTypeManager, MetadataTypeManager
|
||||
|
||||
@@ -48,12 +48,15 @@ class PyOCR(OCRBackendBase):
|
||||
builder=pyocr.builders.TextBuilder()
|
||||
)
|
||||
except Exception as exception:
|
||||
error_message = ('Exception calling pyocr with language option: '
|
||||
'{}; {}').format(self.language, exception)
|
||||
error_message = (
|
||||
'Exception calling pyocr with language option: {}; {}'
|
||||
).format(self.language, exception)
|
||||
|
||||
if self.language not in self.languages:
|
||||
error_message = ('{}\nThe requested OCR language "{}" is not '
|
||||
'available and needs to be installed.\n').format(
|
||||
error_message = (
|
||||
'{}\nThe requested OCR language "{}" is not '
|
||||
'available and needs to be installed.\n'
|
||||
).format(
|
||||
error_message, self.language
|
||||
)
|
||||
|
||||
|
||||
@@ -35,7 +35,6 @@ class DocumentTypeSettings(models.Model):
|
||||
natural_key.dependencies = ['documents.DocumentType']
|
||||
|
||||
|
||||
|
||||
@python_2_unicode_compatible
|
||||
class DocumentPageOCRContent(models.Model):
|
||||
document_page = models.OneToOneField(
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
#from importlib import import_module
|
||||
#import logging
|
||||
import os
|
||||
|
||||
#import yaml
|
||||
|
||||
from django.apps import apps
|
||||
from django.conf import settings
|
||||
#from django.utils.functional import Promise
|
||||
#from django.utils.encoding import force_text, python_2_unicode_compatible
|
||||
|
||||
#SETTING_FILE_LAST_KNOWN_GOOD =
|
||||
CONFIGURATION_FILENAME = '_settings.yml'
|
||||
CONFIGURATION_FILEPATH = os.path.join(
|
||||
settings.MEDIA_ROOT, CONFIGURATION_FILENAME
|
||||
)
|
||||
@@ -1,12 +1,10 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import errno
|
||||
import os
|
||||
from shutil import copyfile
|
||||
|
||||
from django.conf import settings
|
||||
from django.core import management
|
||||
from django.core.management.utils import get_random_secret_key
|
||||
|
||||
|
||||
class Command(management.BaseCommand):
|
||||
|
||||
@@ -15,7 +15,6 @@ from documents.search import document_page_search, document_search
|
||||
from events import ModelEventType
|
||||
from events.links import (
|
||||
link_events_for_object, link_object_event_types_user_subcriptions_list,
|
||||
link_object_event_types_user_subcriptions_list_with_icon
|
||||
)
|
||||
from events.permissions import permission_events_view
|
||||
from navigation import SourceColumn
|
||||
|
||||
Reference in New Issue
Block a user