diff --git a/apps/acls/links.py b/apps/acls/links.py index 47964205b7..9c18c6f82d 100644 --- a/apps/acls/links.py +++ b/apps/acls/links.py @@ -13,7 +13,7 @@ acl_grant = Link(text=_(u'grant'), view='acl_multiple_grant', sprite='key_add', acl_revoke = Link(text=_(u'revoke'), view='acl_multiple_revoke', sprite='key_delete', permissions=[ACLS_EDIT_ACL]) acl_holder_new = Link(text=_(u'New holder'), view='acl_holder_new', args='access_object.gid', sprite='user', permissions=[ACLS_EDIT_ACL]) -acl_setup_valid_classes = Link(text=_(u'Default ACLs'), view='acl_setup_valid_classes', icon='lock.png', permissions=[ACLS_CLASS_VIEW_ACL])#, 'children_view_regex=[r'^acl_class', r'^acl_setup']} +acl_setup_valid_classes = Link(text=_(u'Default ACLs'), view='acl_setup_valid_classes', icon='lock.png', permissions=[ACLS_CLASS_VIEW_ACL]) # 'children_view_regex=[r'^acl_class', r'^acl_setup']} acl_class_list = Link(text=_(u'List of classes'), view='acl_setup_valid_classes', sprite='package', permissions=[ACLS_CLASS_VIEW_ACL]) acl_class_acl_list = Link(text=_(u'ACLs for class'), view='acl_class_acl_list', args='object.gid', sprite='lock_go', permissions=[ACLS_CLASS_VIEW_ACL]) acl_class_acl_detail = Link(text=_(u'details'), view='acl_class_acl_detail', args=['access_object_class.gid', 'object.gid'], sprite='key_go', permissions=[ACLS_CLASS_VIEW_ACL]) diff --git a/apps/diagnostics/views.py b/apps/diagnostics/views.py index 6c27fd09cc..e8a429da43 100644 --- a/apps/diagnostics/views.py +++ b/apps/diagnostics/views.py @@ -4,8 +4,6 @@ from django.shortcuts import render_to_response from django.template import RequestContext from django.utils.translation import ugettext_lazy as _ -from permissions.models import Permission - from .api import diagnostics diff --git a/apps/document_indexing/views.py b/apps/document_indexing/views.py index 4876b3cf3b..d321d3ae10 100644 --- a/apps/document_indexing/views.py +++ b/apps/document_indexing/views.py @@ -12,7 +12,7 @@ from django.conf import settings from permissions.models import Permission from documents.permissions import PERMISSION_DOCUMENT_VIEW -from documents.models import Document, DocumentType +from documents.models import Document from documents.views import document_list from common.utils import encapsulate, generate_choices_w_labels from common.widgets import two_state_template @@ -182,7 +182,7 @@ def index_setup_document_types(request, index_pk): Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_INDEXING_EDIT]) except PermissionDenied: AccessEntry.objects.check_access(PERMISSION_DOCUMENT_INDEXING_EDIT, request.user, index) - + return assign_remove( request, left_list=lambda: generate_choices_w_labels(index.get_document_types_not_in_index(), display_object_type=False), @@ -199,7 +199,7 @@ def index_setup_document_types(request, index_pk): } ) - + # Node views def template_node_create(request, parent_pk): parent_node = get_object_or_404(IndexTemplateNode, pk=parent_pk) diff --git a/apps/linking/migrations/0001_initial.py b/apps/linking/migrations/0001_initial.py index 8fab1c3063..54fc438b75 100644 --- a/apps/linking/migrations/0001_initial.py +++ b/apps/linking/migrations/0001_initial.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models @@ -60,4 +59,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['linking'] \ No newline at end of file + complete_apps = ['linking'] diff --git a/apps/main/views.py b/apps/main/views.py index 968dc3824b..ffdb348087 100644 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -5,8 +5,6 @@ from django.template import RequestContext from django.http import HttpResponseRedirect from django.core.urlresolvers import reverse -from permissions.models import Permission - from .conf.settings import DISABLE_HOME_VIEW diff --git a/apps/metadata/api.py b/apps/metadata/api.py index 77a86056bb..49af3e2c0a 100644 --- a/apps/metadata/api.py +++ b/apps/metadata/api.py @@ -117,5 +117,5 @@ def convert_dict_to_dict_list(dictionary): except MetadataType.DoesNotExist: raise ValueError('Unknown metadata type name') result.append({'id': metadata_type.pk, 'value': value}) - + return result diff --git a/apps/metadata/links.py b/apps/metadata/links.py index 3effa484d0..5e48b1bcff 100644 --- a/apps/metadata/links.py +++ b/apps/metadata/links.py @@ -15,19 +15,19 @@ from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT, PERMISSION_METADATA_SET_VIEW) metadata_edit = Link(text=_(u'edit metadata'), view='metadata_edit', args='object.pk', sprite='xhtml_go', permissions=[PERMISSION_METADATA_DOCUMENT_EDIT]) -metadata_view = Link(text=_(u'metadata'), view='metadata_view', args='object.pk', sprite='xhtml_go', permissions=[PERMISSION_METADATA_DOCUMENT_VIEW])#, children_view_regex=['metadata']) +metadata_view = Link(text=_(u'metadata'), view='metadata_view', args='object.pk', sprite='xhtml_go', permissions=[PERMISSION_METADATA_DOCUMENT_VIEW]) # children_view_regex=['metadata']) metadata_multiple_edit = Link(text=_(u'edit metadata'), view='metadata_multiple_edit', sprite='xhtml_go', permissions=[PERMISSION_METADATA_DOCUMENT_EDIT]) metadata_add = Link(text=_(u'add metadata'), view='metadata_add', args='object.pk', sprite='xhtml_add', permissions=[PERMISSION_METADATA_DOCUMENT_ADD]) metadata_multiple_add = Link(text=_(u'add metadata'), view='metadata_multiple_add', sprite='xhtml_add', permissions=[PERMISSION_METADATA_DOCUMENT_ADD]) metadata_remove = Link(text=_(u'remove metadata'), view='metadata_remove', args='object.pk', sprite='xhtml_delete', permissions=[PERMISSION_METADATA_DOCUMENT_REMOVE]) metadata_multiple_remove = Link(text=_(u'remove metadata'), view='metadata_multiple_remove', sprite='xhtml_delete', permissions=[PERMISSION_METADATA_DOCUMENT_REMOVE]) -setup_metadata_type_list = Link(text=_(u'metadata types'), view='setup_metadata_type_list', sprite='xhtml_go', icon='xhtml.png', permissions=[PERMISSION_METADATA_TYPE_VIEW])#, children_view_regex=[r'setup_metadata_type']) +setup_metadata_type_list = Link(text=_(u'metadata types'), view='setup_metadata_type_list', sprite='xhtml_go', icon='xhtml.png', permissions=[PERMISSION_METADATA_TYPE_VIEW]) # children_view_regex=[r'setup_metadata_type']) setup_metadata_type_edit = Link(text=_(u'edit'), view='setup_metadata_type_edit', args='object.pk', sprite='xhtml', permissions=[PERMISSION_METADATA_TYPE_EDIT]) setup_metadata_type_delete = Link(text=_(u'delete'), view='setup_metadata_type_delete', args='object.pk', sprite='xhtml_delete', permissions=[PERMISSION_METADATA_TYPE_DELETE]) setup_metadata_type_create = Link(text=_(u'create new'), view='setup_metadata_type_create', sprite='xhtml_add', permissions=[PERMISSION_METADATA_TYPE_CREATE]) -setup_metadata_set_list = Link(text=_(u'metadata sets'), view='setup_metadata_set_list', sprite='table', icon='table.png', permissions=[PERMISSION_METADATA_SET_VIEW])#, children_view_regex=[r'setup_metadata_set']) +setup_metadata_set_list = Link(text=_(u'metadata sets'), view='setup_metadata_set_list', sprite='table', icon='table.png', permissions=[PERMISSION_METADATA_SET_VIEW]) # children_view_regex=[r'setup_metadata_set']) setup_metadata_set_edit = Link(text=_(u'edit'), view='setup_metadata_set_edit', args='object.pk', sprite='table_edit', permissions=[PERMISSION_METADATA_SET_EDIT]) setup_metadata_set_delete = Link(text=_(u'delete'), view='setup_metadata_set_delete', args='object.pk', sprite='table_delete', permissions=[PERMISSION_METADATA_SET_DELETE]) setup_metadata_set_create = Link(text=_(u'create new'), view='setup_metadata_set_create', sprite='table_add', permissions=[PERMISSION_METADATA_SET_CREATE])