diff --git a/mayan/apps/converter/backends/python.py b/mayan/apps/converter/backends/python.py index a82cb08ac7..326daac750 100644 --- a/mayan/apps/converter/backends/python.py +++ b/mayan/apps/converter/backends/python.py @@ -15,14 +15,8 @@ from PIL import Image import sh from common.utils import fs_cleanup -from mimetype.api import get_mimetype from ..classes import ConverterBase -from ..exceptions import ConvertError, UnknownFileFormat -from ..literals import ( - DEFAULT_FILE_FORMAT, DEFAULT_PAGE_NUMBER, TRANSFORMATION_RESIZE, - TRANSFORMATION_ROTATE, TRANSFORMATION_ZOOM -) from ..settings import PDFTOPPM_PATH try: @@ -92,6 +86,3 @@ class Python(ConverterBase): pass return page_count - - - diff --git a/mayan/apps/converter/literals.py b/mayan/apps/converter/literals.py index ca2648e061..69c9c2b3d6 100644 --- a/mayan/apps/converter/literals.py +++ b/mayan/apps/converter/literals.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ @@ -10,41 +9,3 @@ DEFAULT_FILE_FORMAT = 'jpeg' DEFAULT_FILE_FORMAT_MIMETYPE = 'image/jpeg' DIMENSION_SEPARATOR = 'x' - -TRANSFORMATION_RESIZE = 'resize' -TRANSFORMATION_ROTATE = 'rotate' -TRANSFORMATION_DENSITY = 'density' -TRANSFORMATION_ZOOM = 'zoom' - -TRANSFORMATION_CHOICES = { - TRANSFORMATION_RESIZE: { - 'label': _('Resize'), - 'description': _('Resize.'), - 'arguments': [ - {'name': 'width', 'label': _('Width'), 'required': True}, - {'name': 'height', 'label': _('Height'), 'required': False}, - ] - }, - TRANSFORMATION_ROTATE: { - 'label': _('Rotate'), - 'description': _('Rotate by n degress.'), - 'arguments': [ - {'name': 'degrees', 'label': _('Degrees'), 'required': True} - ] - }, - TRANSFORMATION_DENSITY: { - 'label': _('Density'), - 'description': _('Change the resolution (ie: DPI) without resizing.'), - 'arguments': [ - {'name': 'width', 'label': _('Width'), 'required': True}, - {'name': 'height', 'label': _('Height'), 'required': False}, - ] - }, - TRANSFORMATION_ZOOM: { - 'label': _('Zoom'), - 'description': _('Zoom by n percent.'), - 'arguments': [ - {'name': 'percent', 'label': _('Percent'), 'required': True} - ] - }, -} diff --git a/mayan/apps/document_states/views.py b/mayan/apps/document_states/views.py index 87858f26dd..8b0ecd399c 100644 --- a/mayan/apps/document_states/views.py +++ b/mayan/apps/document_states/views.py @@ -200,7 +200,7 @@ class SetupWorkflowDocumentTypesView(AssignRemoveView): try: Permission.objects.check_permissions(self.request.user, [PERMISSION_WORKFLOW_EDIT]) except PermissionDenied: - AccessEntry.objects.check_access(PERMISSION_WORKFLOW_EDIT, self.request.user,self.workflow) + AccessEntry.objects.check_access(PERMISSION_WORKFLOW_EDIT, self.request.user, self.workflow) return super(SetupWorkflowDocumentTypesView, self).dispatch(request, *args, **kwargs) diff --git a/mayan/apps/metadata/apps.py b/mayan/apps/metadata/apps.py index e6a81b6ab8..d16370e700 100644 --- a/mayan/apps/metadata/apps.py +++ b/mayan/apps/metadata/apps.py @@ -33,7 +33,7 @@ from .links import ( link_setup_metadata_type_delete, link_setup_metadata_type_edit, link_setup_metadata_type_list, link_documents_missing_required_metadata ) -from .models import DocumentMetadata, DocumentTypeMetadataType, MetadataType +from .models import DocumentTypeMetadataType, MetadataType from .permissions import ( PERMISSION_METADATA_DOCUMENT_ADD, PERMISSION_METADATA_DOCUMENT_EDIT, PERMISSION_METADATA_DOCUMENT_REMOVE, PERMISSION_METADATA_DOCUMENT_VIEW diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index 05dcc906a6..5d5626c588 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -13,7 +13,7 @@ from django.utils.translation import ugettext_lazy as _, ungettext from acls.models import AccessEntry from documents.models import Document, DocumentType from documents.permissions import ( - PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_VIEW + PERMISSION_DOCUMENT_TYPE_EDIT ) from documents.views import DocumentListView from permissions.models import Permission @@ -163,7 +163,7 @@ def metadata_add(request, document_id=None, document_id_list=None): if not documents: messages.error(request, _('Must provide at least one document.')) - return HttpResponseRedirect(request.META.get('HTTP_REFERER', reversesettings.LOGIN_REDIRECT_URL)) + return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))) for document in documents: document.add_as_recent_document_for_user(request.user)