diff --git a/mayan/apps/linking/__init__.py b/mayan/apps/linking/__init__.py index bbcd5a9bb9..d11769a57c 100644 --- a/mayan/apps/linking/__init__.py +++ b/mayan/apps/linking/__init__.py @@ -6,19 +6,20 @@ from documents.models import Document from navigation.api import register_links, register_sidebar_template from project_setup.api import register_setup -from .links import (smart_link_instances_for_document, - smart_link_setup, smart_link_list, smart_link_create, smart_link_edit, - smart_link_delete, smart_link_condition_list, smart_link_condition_create, - smart_link_condition_edit, smart_link_condition_delete, smart_link_acl_list) +from .links import (smart_link_acl_list, smart_link_create, + smart_link_condition_create, smart_link_condition_delete, + smart_link_condition_edit, smart_link_condition_list, + smart_link_delete, smart_link_edit, + smart_link_instances_for_document, smart_link_list, + smart_link_setup) from .models import SmartLink, SmartLinkCondition -from .permissions import (PERMISSION_SMART_LINK_VIEW, - PERMISSION_SMART_LINK_DELETE, PERMISSION_SMART_LINK_EDIT) +from .permissions import (PERMISSION_SMART_LINK_DELETE, + PERMISSION_SMART_LINK_EDIT, + PERMISSION_SMART_LINK_VIEW) register_links(Document, [smart_link_instances_for_document], menu_name='form_header') - register_links(SmartLink, [smart_link_edit, smart_link_delete, smart_link_condition_list, smart_link_acl_list]) register_links([SmartLink, 'linking:smart_link_list', 'linking:smart_link_create'], [smart_link_list, smart_link_create], menu_name='secondary_menu') - register_links(SmartLinkCondition, [smart_link_condition_edit, smart_link_condition_delete]) register_links(['linking:smart_link_condition_list', 'linking:smart_link_condition_create', 'linking:smart_link_condition_edit', 'linking:smart_link_condition_delete'], [smart_link_condition_create], menu_name='sidebar') @@ -26,9 +27,6 @@ register_setup(smart_link_setup) register_sidebar_template(['linking:smart_link_list'], 'smart_links_help.html') class_permissions(SmartLink, [ - PERMISSION_SMART_LINK_VIEW, - PERMISSION_SMART_LINK_DELETE, - PERMISSION_SMART_LINK_EDIT, - ACLS_EDIT_ACL, - ACLS_VIEW_ACL + ACLS_EDIT_ACL, ACLS_VIEW_ACL, PERMISSION_SMART_LINK_DELETE, + PERMISSION_SMART_LINK_EDIT, PERMISSION_SMART_LINK_VIEW ]) diff --git a/mayan/apps/linking/links.py b/mayan/apps/linking/links.py index f9bb605e3c..ae87a6914c 100644 --- a/mayan/apps/linking/links.py +++ b/mayan/apps/linking/links.py @@ -6,7 +6,8 @@ from acls.permissions import ACLS_VIEW_ACL from documents.permissions import PERMISSION_DOCUMENT_VIEW from .permissions import (PERMISSION_SMART_LINK_CREATE, - PERMISSION_SMART_LINK_DELETE, PERMISSION_SMART_LINK_EDIT) + PERMISSION_SMART_LINK_DELETE, + PERMISSION_SMART_LINK_EDIT) smart_link_instance_view_link = {'text': _(u'Smart links actions'), 'view': 'linking:smart_link_instance_view', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]} smart_link_instances_for_document = {'text': _(u'Smart links'), 'view': 'linking:smart_link_instances_for_document', 'args': 'object.pk', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]} diff --git a/mayan/apps/linking/managers.py b/mayan/apps/linking/managers.py index dabed6a843..940c34fc80 100644 --- a/mayan/apps/linking/managers.py +++ b/mayan/apps/linking/managers.py @@ -3,8 +3,8 @@ from __future__ import absolute_import from django.db import models from django.db.models import Q -from metadata.classes import MetadataClass from documents.models import Document +from metadata.classes import MetadataClass from .literals import INCLUSION_AND, INCLUSION_OR diff --git a/mayan/apps/linking/models.py b/mayan/apps/linking/models.py index 83f0cab8cd..d8dab1f8a9 100644 --- a/mayan/apps/linking/models.py +++ b/mayan/apps/linking/models.py @@ -3,9 +3,8 @@ from __future__ import absolute_import from django.db import models from django.utils.translation import ugettext_lazy as _ +from .literals import INCLUSION_AND, INCLUSION_CHOICES, OPERATOR_CHOICES from .managers import SmartLinkManager -from .literals import (OPERATOR_CHOICES, INCLUSION_AND, - INCLUSION_CHOICES) class SmartLink(models.Model): diff --git a/mayan/apps/linking/views.py b/mayan/apps/linking/views.py index d22a71308d..ca2b1f82a9 100644 --- a/mayan/apps/linking/views.py +++ b/mayan/apps/linking/views.py @@ -10,23 +10,24 @@ from django.shortcuts import get_object_or_404, render_to_response from django.template import RequestContext from django.utils.translation import ugettext_lazy as _ -from acls.views import acl_list_for from acls.models import AccessEntry from acls.utils import apply_default_acls +from acls.views import acl_list_for from common.utils import encapsulate from common.widgets import two_state_template from documents.models import Document -from documents.views import document_list from documents.permissions import PERMISSION_DOCUMENT_VIEW +from documents.views import document_list from permissions.models import Permission -from .forms import (SmartLinkInstanceForm, SmartLinkForm, - SmartLinkConditionForm) +from .forms import (SmartLinkConditionForm, SmartLinkInstanceForm, + SmartLinkForm) from .links import smart_link_instance_view_link from .models import SmartLink, SmartLinkCondition -from .permissions import (PERMISSION_SMART_LINK_VIEW, - PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE, - PERMISSION_SMART_LINK_EDIT) +from .permissions import (PERMISSION_SMART_LINK_CREATE, + PERMISSION_SMART_LINK_DELETE, + PERMISSION_SMART_LINK_EDIT, + PERMISSION_SMART_LINK_VIEW) from .settings import SHOW_EMPTY_SMART_LINKS logger = logging.getLogger(__name__) diff --git a/mayan/apps/main/views.py b/mayan/apps/main/views.py index 9b7be5bb20..c768716037 100644 --- a/mayan/apps/main/views.py +++ b/mayan/apps/main/views.py @@ -1,11 +1,11 @@ from __future__ import absolute_import +from django.core.exceptions import PermissionDenied +from django.core.urlresolvers import reverse +from django.http import HttpResponseRedirect from django.shortcuts import render_to_response from django.template import RequestContext from django.utils.translation import ugettext_lazy as _ -from django.core.exceptions import PermissionDenied -from django.http import HttpResponseRedirect -from django.core.urlresolvers import reverse from permissions.models import Permission diff --git a/mayan/apps/metadata/forms.py b/mayan/apps/metadata/forms.py index 39b3459f9b..c83aa1c490 100644 --- a/mayan/apps/metadata/forms.py +++ b/mayan/apps/metadata/forms.py @@ -6,8 +6,8 @@ from django.utils.translation import ugettext_lazy as _ from common.widgets import ScrollableCheckboxSelectMultiple -from .models import MetadataSet, MetadataType, DocumentTypeDefaults -from .settings import AVAILABLE_MODELS, AVAILABLE_FUNCTIONS +from .models import DocumentTypeDefaults, MetadataSet, MetadataType +from .settings import AVAILABLE_FUNCTIONS, AVAILABLE_MODELS class MetadataForm(forms.Form): diff --git a/mayan/apps/ocr/__init__.py b/mayan/apps/ocr/__init__.py index 2beacb32f8..47e25ac0be 100644 --- a/mayan/apps/ocr/__init__.py +++ b/mayan/apps/ocr/__init__.py @@ -18,15 +18,15 @@ from statistics.classes import StatisticNamespace from south.signals import post_migrate from .exceptions import AlreadyQueued -from .links import (submit_document, submit_document_multiple, - re_queue_multiple_document, queue_document_multiple_delete, - document_queue_disable, document_queue_enable, - all_document_ocr_cleanup, queue_document_list, - ocr_tool_link) -from .literals import QUEUEDOCUMENT_STATE_PENDING, QUEUEDOCUMENT_STATE_PROCESSING +from .links import (all_document_ocr_cleanup, document_queue_disable, + document_queue_enable, ocr_tool_link, queue_document_list, + queue_document_multiple_delete, re_queue_multiple_document, + submit_document, submit_document_multiple) +from .literals import (QUEUEDOCUMENT_STATE_PENDING, + QUEUEDOCUMENT_STATE_PROCESSING) from .models import DocumentQueue from .permissions import PERMISSION_OCR_DOCUMENT -from .settings import (AUTOMATIC_OCR, QUEUE_PROCESSING_INTERVAL) +from .settings import AUTOMATIC_OCR, QUEUE_PROCESSING_INTERVAL from .statistics import OCRStatistics from .tasks import task_process_document_queues diff --git a/mayan/apps/ocr/api.py b/mayan/apps/ocr/api.py index 261cac66a8..0d0b0fc88b 100644 --- a/mayan/apps/ocr/api.py +++ b/mayan/apps/ocr/api.py @@ -14,8 +14,8 @@ from converter.api import convert from documents.models import DocumentPage from .exceptions import UnpaperError -from .literals import (DEFAULT_OCR_FILE_FORMAT, UNPAPER_FILE_FORMAT, - DEFAULT_OCR_FILE_EXTENSION) +from .literals import (DEFAULT_OCR_FILE_EXTENSION, DEFAULT_OCR_FILE_FORMAT, + UNPAPER_FILE_FORMAT) from .parsers import parse_document_page from .parsers.exceptions import ParserError, ParserUnknownFile from .runtime import language_backend, ocr_backend diff --git a/mayan/apps/ocr/links.py b/mayan/apps/ocr/links.py index 4f5fbd54ef..25b737eb16 100644 --- a/mayan/apps/ocr/links.py +++ b/mayan/apps/ocr/links.py @@ -2,9 +2,10 @@ from __future__ import absolute_import from django.utils.translation import ugettext_lazy as _ -from .permissions import (PERMISSION_OCR_DOCUMENT, - PERMISSION_OCR_DOCUMENT_DELETE, PERMISSION_OCR_QUEUE_ENABLE_DISABLE, - PERMISSION_OCR_CLEAN_ALL_PAGES) +from .permissions import (PERMISSION_OCR_CLEAN_ALL_PAGES, + PERMISSION_OCR_DOCUMENT, + PERMISSION_OCR_DOCUMENT_DELETE, + PERMISSION_OCR_QUEUE_ENABLE_DISABLE) submit_document = {'text': _('Submit to OCR queue'), 'view': 'ocr:submit_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} submit_document_multiple = {'text': _('Submit to OCR queue'), 'view': 'ocr:submit_document_multiple', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} diff --git a/mayan/apps/ocr/models.py b/mayan/apps/ocr/models.py index a32fa5b832..72a24eac95 100644 --- a/mayan/apps/ocr/models.py +++ b/mayan/apps/ocr/models.py @@ -9,9 +9,9 @@ from django.utils.translation import ugettext_lazy as _ from documents.models import Document from .exceptions import ReQueueError -from .literals import (DOCUMENTQUEUE_STATE_CHOICES, - QUEUEDOCUMENT_STATE_PENDING, QUEUEDOCUMENT_STATE_CHOICES, - QUEUEDOCUMENT_STATE_PROCESSING, DOCUMENTQUEUE_STATE_ACTIVE) +from .literals import (DOCUMENTQUEUE_STATE_ACTIVE, DOCUMENTQUEUE_STATE_CHOICES, + QUEUEDOCUMENT_STATE_CHOICES, QUEUEDOCUMENT_STATE_PENDING, + QUEUEDOCUMENT_STATE_PROCESSING) from .managers import DocumentQueueManager diff --git a/mayan/apps/ocr/tasks.py b/mayan/apps/ocr/tasks.py index 22e169cbb5..a7790486e9 100644 --- a/mayan/apps/ocr/tasks.py +++ b/mayan/apps/ocr/tasks.py @@ -14,10 +14,10 @@ from job_processor.api import process_job from lock_manager import Lock, LockError from .api import do_document_ocr -from .literals import (QUEUEDOCUMENT_STATE_PENDING, - QUEUEDOCUMENT_STATE_PROCESSING, DOCUMENTQUEUE_STATE_ACTIVE, - QUEUEDOCUMENT_STATE_ERROR) -from .models import QueueDocument, DocumentQueue +from .literals import (DOCUMENTQUEUE_STATE_ACTIVE, QUEUEDOCUMENT_STATE_ERROR, + QUEUEDOCUMENT_STATE_PENDING, + QUEUEDOCUMENT_STATE_PROCESSING) +from .models import DocumentQueue, QueueDocument from .settings import NODE_CONCURRENT_EXECUTION, REPLICATION_DELAY LOCK_EXPIRE = 60 * 2 # Lock expires in 2 minutes diff --git a/mayan/apps/ocr/views.py b/mayan/apps/ocr/views.py index 13b42791f7..701fc46e2d 100644 --- a/mayan/apps/ocr/views.py +++ b/mayan/apps/ocr/views.py @@ -3,7 +3,7 @@ from __future__ import absolute_import from django.contrib import messages from django.core.exceptions import PermissionDenied from django.http import HttpResponseRedirect -from django.shortcuts import render_to_response, get_object_or_404 +from django.shortcuts import get_object_or_404, render_to_response from django.template import RequestContext from django.utils.translation import ugettext_lazy as _ @@ -15,12 +15,14 @@ from permissions.models import Permission from .api import clean_pages from .exceptions import AlreadyQueued, ReQueueError -from .literals import (QUEUEDOCUMENT_STATE_PROCESSING, - DOCUMENTQUEUE_STATE_STOPPED, DOCUMENTQUEUE_STATE_ACTIVE) +from .literals import (DOCUMENTQUEUE_STATE_ACTIVE, + DOCUMENTQUEUE_STATE_STOPPED, + QUEUEDOCUMENT_STATE_PROCESSING) from .models import DocumentQueue, QueueDocument -from .permissions import (PERMISSION_OCR_DOCUMENT, - PERMISSION_OCR_DOCUMENT_DELETE, PERMISSION_OCR_QUEUE_ENABLE_DISABLE, - PERMISSION_OCR_CLEAN_ALL_PAGES) +from .permissions import (PERMISSION_OCR_CLEAN_ALL_PAGES, + PERMISSION_OCR_DOCUMENT, + PERMISSION_OCR_DOCUMENT_DELETE, + PERMISSION_OCR_QUEUE_ENABLE_DISABLE) def queue_document_list(request, queue_name='default'): diff --git a/mayan/apps/permissions/__init__.py b/mayan/apps/permissions/__init__.py index 6cfc984e2a..f6a2387d46 100644 --- a/mayan/apps/permissions/__init__.py +++ b/mayan/apps/permissions/__init__.py @@ -8,13 +8,13 @@ from navigation.api import register_links, register_multi_item_links from project_setup.api import register_setup from .models import Role -from .links import (role_list, role_create, role_edit, role_members, - role_permissions, role_delete, permission_grant, - permission_revoke) +from .links import (permission_grant, permission_revoke, role_create, + role_delete, role_edit, role_list, role_members, + role_permissions) from .settings import DEFAULT_ROLES -register_links(Role, [role_edit, role_delete, role_permissions, role_members]) -register_links([Role, 'permissions:role_list', 'permissions:role_create'], [role_list, role_create], menu_name='secondary_menu') +register_links(Role, [role_delete, role_edit, role_members, role_permissions]) +register_links([Role, 'permissions:role_create', 'permissions:role_list'], [role_create, role_list], menu_name='secondary_menu') register_multi_item_links(['permissions:role_permissions'], [permission_grant, permission_revoke]) permission_views = ['permissions:role_list', 'permissions:role_create', 'permissions:role_edit', 'permissions:role_members', 'permissions:role_permissions', 'permissions:role_delete'] diff --git a/mayan/apps/permissions/links.py b/mayan/apps/permissions/links.py index c1a659de17..5d48224464 100644 --- a/mayan/apps/permissions/links.py +++ b/mayan/apps/permissions/links.py @@ -2,16 +2,17 @@ from __future__ import absolute_import from django.utils.translation import ugettext_lazy as _ -from .permissions import (PERMISSION_ROLE_VIEW, PERMISSION_ROLE_EDIT, - PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, - PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE) - -role_list = {'text': _(u'Roles'), 'view': 'permissions:role_list', 'famfam': 'medal_gold_1', 'icon': 'medal_gold_1.png', 'permissions': [PERMISSION_ROLE_VIEW], 'children_view_regex': [r'^permission_', r'^role_']} -role_create = {'text': _(u'Create new role'), 'view': 'permissions:role_create', 'famfam': 'medal_gold_add', 'permissions': [PERMISSION_ROLE_CREATE]} -role_edit = {'text': _(u'Edit'), 'view': 'permissions:role_edit', 'args': 'object.id', 'famfam': 'medal_gold_1', 'permissions': [PERMISSION_ROLE_EDIT]} -role_members = {'text': _(u'Members'), 'view': 'permissions:role_members', 'args': 'object.id', 'famfam': 'group_key', 'permissions': [PERMISSION_ROLE_EDIT]} -role_permissions = {'text': _(u'Role permissions'), 'view': 'permissions:role_permissions', 'args': 'object.id', 'famfam': 'key_go', 'permissions': [PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE]} -role_delete = {'text': _(u'Delete'), 'view': 'permissions:role_delete', 'args': 'object.id', 'famfam': 'medal_gold_delete', 'permissions': [PERMISSION_ROLE_DELETE]} +from .permissions import (PERMISSION_PERMISSION_GRANT, + PERMISSION_PERMISSION_REVOKE, PERMISSION_ROLE_CREATE, + PERMISSION_ROLE_DELETE, PERMISSION_ROLE_EDIT, + PERMISSION_ROLE_VIEW) permission_grant = {'text': _(u'Grant'), 'view': 'permissions:permission_multiple_grant', 'famfam': 'key_add', 'permissions': [PERMISSION_PERMISSION_GRANT]} permission_revoke = {'text': _(u'Revoke'), 'view': 'permissions:permission_multiple_revoke', 'famfam': 'key_delete', 'permissions': [PERMISSION_PERMISSION_REVOKE]} + +role_create = {'text': _(u'Create new role'), 'view': 'permissions:role_create', 'famfam': 'medal_gold_add', 'permissions': [PERMISSION_ROLE_CREATE]} +role_delete = {'text': _(u'Delete'), 'view': 'permissions:role_delete', 'args': 'object.id', 'famfam': 'medal_gold_delete', 'permissions': [PERMISSION_ROLE_DELETE]} +role_edit = {'text': _(u'Edit'), 'view': 'permissions:role_edit', 'args': 'object.id', 'famfam': 'medal_gold_1', 'permissions': [PERMISSION_ROLE_EDIT]} +role_list = {'text': _(u'Roles'), 'view': 'permissions:role_list', 'famfam': 'medal_gold_1', 'icon': 'medal_gold_1.png', 'permissions': [PERMISSION_ROLE_VIEW], 'children_view_regex': [r'^permission_', r'^role_']} +role_members = {'text': _(u'Members'), 'view': 'permissions:role_members', 'args': 'object.id', 'famfam': 'group_key', 'permissions': [PERMISSION_ROLE_EDIT]} +role_permissions = {'text': _(u'Role permissions'), 'view': 'permissions:role_permissions', 'args': 'object.id', 'famfam': 'key_go', 'permissions': [PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE]} diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py index 8e18ab2aab..d3e626e33e 100644 --- a/mayan/apps/permissions/views.py +++ b/mayan/apps/permissions/views.py @@ -5,26 +5,27 @@ from json import loads import operator from django.contrib import messages -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group, User from django.contrib.contenttypes.models import ContentType from django.core.urlresolvers import reverse_lazy -from django.http import HttpResponseRedirect, Http404 -from django.shortcuts import render_to_response, get_object_or_404 +from django.http import Http404, HttpResponseRedirect +from django.shortcuts import get_object_or_404, render_to_response from django.template import RequestContext from django.utils.translation import ugettext_lazy as _ from acls.classes import EncapsulatedObject from common.models import AnonymousUserSingleton -from common.views import assign_remove -from common.views import SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView +from common.views import (SingleObjectCreateView, SingleObjectDeleteView, + SingleObjectEditView, assign_remove) from common.utils import encapsulate, get_object_name from common.widgets import two_state_template from .forms import RoleForm, RoleForm_view -from .models import Role, Permission -from .permissions import (PERMISSION_ROLE_VIEW, PERMISSION_ROLE_EDIT, - PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, - PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE) +from .models import Permission, Role +from .permissions import (PERMISSION_PERMISSION_GRANT, + PERMISSION_PERMISSION_REVOKE, PERMISSION_ROLE_VIEW, + PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, + PERMISSION_ROLE_EDIT) class RoleCreateView(SingleObjectCreateView): diff --git a/mayan/apps/smart_settings/views.py b/mayan/apps/smart_settings/views.py index c7bee922cb..551b888520 100644 --- a/mayan/apps/smart_settings/views.py +++ b/mayan/apps/smart_settings/views.py @@ -5,7 +5,7 @@ from django.template import RequestContext from django.utils.translation import ugettext_lazy as _ from django.utils.safestring import mark_safe -from common.utils import return_type, encapsulate +from common.utils import encapsulate, return_type from common.widgets import exists_with_famfam from .api import settings diff --git a/mayan/apps/sources/admin.py b/mayan/apps/sources/admin.py index 987ce6d89b..c4d19eb763 100644 --- a/mayan/apps/sources/admin.py +++ b/mayan/apps/sources/admin.py @@ -2,8 +2,8 @@ from __future__ import absolute_import from django.contrib import admin -from .models import StagingFolder, WebForm, SourceTransformation +from .models import StagingFolder, SourceTransformation, WebForm admin.site.register(StagingFolder) -admin.site.register(WebForm) admin.site.register(SourceTransformation) +admin.site.register(WebForm) diff --git a/mayan/apps/sources/forms.py b/mayan/apps/sources/forms.py index 127d13be62..f28a7f7984 100644 --- a/mayan/apps/sources/forms.py +++ b/mayan/apps/sources/forms.py @@ -3,15 +3,14 @@ from __future__ import absolute_import import logging from django import forms -from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext +from django.utils.translation import ugettext_lazy as _ from documents.forms import DocumentForm -from .models import (WebForm, StagingFolder, SourceTransformation, - WatchFolder) -from .widgets import FamFamRadioSelect +from .models import SourceTransformation, StagingFolder, WebForm, WatchFolder from .utils import validate_whitelist_blacklist +from .widgets import FamFamRadioSelect logger = logging.getLogger(__name__) diff --git a/mayan/apps/sources/links.py b/mayan/apps/sources/links.py index dd26eed1e4..dfc8892bae 100644 --- a/mayan/apps/sources/links.py +++ b/mayan/apps/sources/links.py @@ -2,13 +2,14 @@ from __future__ import absolute_import from django.utils.translation import ugettext_lazy as _ -from documents.permissions import (PERMISSION_DOCUMENT_NEW_VERSION, - PERMISSION_DOCUMENT_CREATE) +from documents.permissions import (PERMISSION_DOCUMENT_CREATE, + PERMISSION_DOCUMENT_NEW_VERSION) -from .models import (WebForm, StagingFolder, WatchFolder) -from .permissions import (PERMISSION_SOURCES_SETUP_VIEW, - PERMISSION_SOURCES_SETUP_EDIT, PERMISSION_SOURCES_SETUP_DELETE, - PERMISSION_SOURCES_SETUP_CREATE) +from .models import (StagingFolder, WatchFolder, WebForm) +from .permissions import (PERMISSION_SOURCES_SETUP_CREATE, + PERMISSION_SOURCES_SETUP_DELETE, + PERMISSION_SOURCES_SETUP_EDIT, + PERMISSION_SOURCES_SETUP_VIEW) document_create_multiple = {'text': _(u'Upload new documents'), 'view': 'sources:document_create_multiple', 'famfam': 'page_add', 'permissions': [PERMISSION_DOCUMENT_CREATE], 'children_view_regex': [r'upload_interactive']} document_create_siblings = {'text': _(u'Clone metadata'), 'view': 'sources:document_create_siblings', 'args': 'object.id', 'famfam': 'page_copy', 'permissions': [PERMISSION_DOCUMENT_CREATE]} diff --git a/mayan/apps/sources/management/commands/bulk_upload.py b/mayan/apps/sources/management/commands/bulk_upload.py index 70f4abb09f..0de9840add 100644 --- a/mayan/apps/sources/management/commands/bulk_upload.py +++ b/mayan/apps/sources/management/commands/bulk_upload.py @@ -8,10 +8,10 @@ import sys from django.core.management.base import CommandError, LabelCommand from documents.models import DocumentType +from common.compressed_files import NotACompressedFile from metadata.api import convert_dict_to_dict_list from ...models import OutOfProcess -from common.compressed_files import NotACompressedFile class Command(LabelCommand): args = '' diff --git a/mayan/apps/sources/managers.py b/mayan/apps/sources/managers.py index c5f6484517..fc30d430b4 100644 --- a/mayan/apps/sources/managers.py +++ b/mayan/apps/sources/managers.py @@ -1,7 +1,7 @@ from ast import literal_eval -from django.db import models from django.contrib.contenttypes.models import ContentType +from django.db import models class SourceTransformationManager(models.Manager): diff --git a/mayan/apps/sources/permissions.py b/mayan/apps/sources/permissions.py index e5911fe72c..13927619f1 100644 --- a/mayan/apps/sources/permissions.py +++ b/mayan/apps/sources/permissions.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _ from permissions.models import Permission, PermissionNamespace sources_setup_namespace = PermissionNamespace('sources_setup', _(u'Sources setup')) -PERMISSION_SOURCES_SETUP_VIEW = Permission.objects.register(sources_setup_namespace, 'sources_setup_view', _(u'View existing document sources')) -PERMISSION_SOURCES_SETUP_EDIT = Permission.objects.register(sources_setup_namespace, 'sources_setup_edit', _(u'Edit document sources')) -PERMISSION_SOURCES_SETUP_DELETE = Permission.objects.register(sources_setup_namespace, 'sources_setup_delete', _(u'Delete document sources')) PERMISSION_SOURCES_SETUP_CREATE = Permission.objects.register(sources_setup_namespace, 'sources_setup_create', _(u'Create new document sources')) +PERMISSION_SOURCES_SETUP_DELETE = Permission.objects.register(sources_setup_namespace, 'sources_setup_delete', _(u'Delete document sources')) +PERMISSION_SOURCES_SETUP_EDIT = Permission.objects.register(sources_setup_namespace, 'sources_setup_edit', _(u'Edit document sources')) +PERMISSION_SOURCES_SETUP_VIEW = Permission.objects.register(sources_setup_namespace, 'sources_setup_view', _(u'View existing document sources')) diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py index 0d3bcea998..6fb03d18a0 100644 --- a/mayan/apps/sources/views.py +++ b/mayan/apps/sources/views.py @@ -17,20 +17,21 @@ from common.utils import encapsulate from documents.exceptions import NewDocumentVersionNotAllowed from documents.models import DocumentType, Document from documents.permissions import (PERMISSION_DOCUMENT_CREATE, - PERMISSION_DOCUMENT_NEW_VERSION) + PERMISSION_DOCUMENT_NEW_VERSION) from metadata.api import decode_metadata_from_url, metadata_repr_as_list from permissions.models import Permission -from .forms import (SourceTransformationForm, SourceTransformationForm_create, - WebFormSetupForm, StagingFolderSetupForm, StagingDocumentForm, WebFormForm, - WatchFolderSetupForm) -from .literals import (SOURCE_CHOICE_WEB_FORM, SOURCE_CHOICE_STAGING, - SOURCE_CHOICE_WATCH, SOURCE_UNCOMPRESS_CHOICE_Y, SOURCE_UNCOMPRESS_CHOICE_ASK) -from .models import (WebForm, StagingFolder, SourceTransformation, - WatchFolder) -from .permissions import (PERMISSION_SOURCES_SETUP_VIEW, - PERMISSION_SOURCES_SETUP_EDIT, PERMISSION_SOURCES_SETUP_DELETE, - PERMISSION_SOURCES_SETUP_CREATE) +from .forms import (StagingDocumentForm, StagingFolderSetupForm, + SourceTransformationForm, SourceTransformationForm_create, + WatchFolderSetupForm, WebFormForm, WebFormSetupForm) +from .literals import (SOURCE_CHOICE_STAGING, SOURCE_CHOICE_WATCH, + SOURCE_CHOICE_WEB_FORM, SOURCE_UNCOMPRESS_CHOICE_ASK, + SOURCE_UNCOMPRESS_CHOICE_Y) +from .models import StagingFolder, SourceTransformation, WatchFolder, WebForm +from .permissions import (PERMISSION_SOURCES_SETUP_CREATE, + PERMISSION_SOURCES_SETUP_DELETE, + PERMISSION_SOURCES_SETUP_EDIT, + PERMISSION_SOURCES_SETUP_VIEW) def document_create_siblings(request, document_id): diff --git a/mayan/apps/sources/widgets.py b/mayan/apps/sources/widgets.py index a6936a9230..9d67a13bf1 100644 --- a/mayan/apps/sources/widgets.py +++ b/mayan/apps/sources/widgets.py @@ -9,7 +9,7 @@ from django.utils.translation import ugettext_lazy as _ from converter.literals import (DEFAULT_PAGE_NUMBER, DEFAULT_ROTATION, DEFAULT_ZOOM_LEVEL) -from documents.settings import THUMBNAIL_SIZE, PREVIEW_SIZE +from documents.settings import PREVIEW_SIZE, THUMBNAIL_SIZE class FamFamRadioFieldRenderer(forms.widgets.RadioFieldRenderer): diff --git a/mayan/apps/sources/wizards.py b/mayan/apps/sources/wizards.py index 505bc4e987..d028bfeff0 100644 --- a/mayan/apps/sources/wizards.py +++ b/mayan/apps/sources/wizards.py @@ -9,7 +9,7 @@ from django.utils.translation import ugettext_lazy as _ from common.views import MayanPermissionCheckMixin from documents.forms import DocumentTypeSelectForm from documents.permissions import PERMISSION_DOCUMENT_CREATE -from metadata.forms import MetadataSelectionForm, MetadataFormSet +from metadata.forms import MetadataFormSet, MetadataSelectionForm class DocumentCreateWizard(MayanPermissionCheckMixin, SessionWizardView): diff --git a/mayan/apps/tags/__init__.py b/mayan/apps/tags/__init__.py index 5465496125..11038f76b7 100644 --- a/mayan/apps/tags/__init__.py +++ b/mayan/apps/tags/__init__.py @@ -51,14 +51,11 @@ register_multi_item_links(['document_tags'], [single_document_multiple_tag_remov register_multi_item_links(['documents:document_find_duplicates', 'folders:folder_view', 'indexes:index_instance_node_view', 'documents:document_type_document_list', 'search:search', 'search:results', 'linking:document_group_view', 'documents:document_list', 'documents:document_list_recent', 'tags:tag_tagged_item_list'], [tag_multiple_attach, multiple_documents_selection_tag_remove]) class_permissions(Document, [ - PERMISSION_TAG_ATTACH, - PERMISSION_TAG_REMOVE, + PERMISSION_TAG_ATTACH, PERMISSION_TAG_REMOVE, ]) class_permissions(Tag, [ - PERMISSION_TAG_DELETE, - PERMISSION_TAG_EDIT, - PERMISSION_TAG_VIEW, + PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT, PERMISSION_TAG_VIEW, ]) Document.add_to_class('tags', TaggableManager()) diff --git a/mayan/apps/tags/links.py b/mayan/apps/tags/links.py index d1d3d973d1..10020719fa 100644 --- a/mayan/apps/tags/links.py +++ b/mayan/apps/tags/links.py @@ -4,8 +4,9 @@ from django.utils.translation import ugettext_lazy as _ from acls.permissions import ACLS_VIEW_ACL -from .permissions import (PERMISSION_TAG_CREATE, PERMISSION_TAG_ATTACH, - PERMISSION_TAG_REMOVE, PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT) +from .permissions import (PERMISSION_TAG_CREATE, PERMISSION_TAG_DELETE, + PERMISSION_TAG_ATTACH, PERMISSION_TAG_EDIT, + PERMISSION_TAG_REMOVE) tag_list = {'text': _(u'Tag list'), 'view': 'tags:tag_list', 'famfam': 'tag_blue'} tag_create = {'text': _(u'Create new tag'), 'view': 'tags:tag_create', 'famfam': 'tag_blue_add', 'permissions': [PERMISSION_TAG_CREATE]}