From 14e71ce42faeadf73587099da9822bccce87b764 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 11 Apr 2019 21:03:02 -0400 Subject: [PATCH] Add keyword arguments to PermissionNamespace uses Signed-off-by: Roberto Rosario --- mayan/apps/acls/permissions.py | 2 +- mayan/apps/acls/views.py | 4 ++-- mayan/apps/cabinets/permissions.py | 2 +- mayan/apps/checkouts/permissions.py | 2 +- mayan/apps/common/permissions_runtime.py | 2 +- mayan/apps/converter/permissions.py | 2 +- mayan/apps/django_gpg/permissions.py | 2 +- mayan/apps/document_comments/permissions.py | 2 +- mayan/apps/document_indexing/permissions.py | 2 +- mayan/apps/document_parsing/permissions.py | 4 +++- mayan/apps/document_signatures/permissions.py | 2 +- mayan/apps/document_states/permissions.py | 4 +++- mayan/apps/documents/permissions.py | 4 ++-- mayan/apps/events/permissions.py | 3 ++- mayan/apps/linking/permissions.py | 2 +- mayan/apps/mailer/permissions.py | 2 +- mayan/apps/mayan_statistics/permissions.py | 2 +- mayan/apps/metadata/permissions.py | 8 ++++++-- mayan/apps/motd/permissions.py | 2 +- mayan/apps/ocr/permissions.py | 2 +- mayan/apps/permissions/permissions.py | 2 +- mayan/apps/smart_settings/permissions.py | 4 +++- mayan/apps/sources/permissions.py | 3 ++- mayan/apps/tags/permissions.py | 2 +- mayan/apps/task_manager/permissions.py | 2 +- mayan/apps/user_management/permissions.py | 4 +++- 26 files changed, 43 insertions(+), 29 deletions(-) diff --git a/mayan/apps/acls/permissions.py b/mayan/apps/acls/permissions.py index b2e7e789a1..ada2ec8c36 100644 --- a/mayan/apps/acls/permissions.py +++ b/mayan/apps/acls/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('acls', _('Access control lists')) +namespace = PermissionNamespace(name='acls', label=_('Access control lists')) permission_acl_edit = namespace.add_permission( name='acl_edit', label=_('Edit ACLs') diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py index 241217eb24..e32bd6f801 100644 --- a/mayan/apps/acls/views.py +++ b/mayan/apps/acls/views.py @@ -15,7 +15,7 @@ from mayan.apps.common.views import ( AssignRemoveView, SingleObjectCreateView, SingleObjectDeleteView, SingleObjectListView ) -from mayan.apps.permissions import PermissionNamespace, Permission +from mayan.apps.permissions import Permission, PermissionNamespace from mayan.apps.permissions.models import StoredPermission from .classes import ModelPermission @@ -183,7 +183,7 @@ class ACLPermissionsView(AssignRemoveView): (force_text(permission.pk), permission) for permission in permissions ] results.append( - (PermissionNamespace.get(namespace), permission_options) + (PermissionNamespace.get(name=namespace), permission_options) ) return results diff --git a/mayan/apps/cabinets/permissions.py b/mayan/apps/cabinets/permissions.py index e6730ce111..f2a2636479 100644 --- a/mayan/apps/cabinets/permissions.py +++ b/mayan/apps/cabinets/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('cabinets', _('Cabinets')) +namespace = PermissionNamespace(name='cabinets', label=_('Cabinets')) # Translators: this refers to the permission that will allow users to add # documents to cabinets. diff --git a/mayan/apps/checkouts/permissions.py b/mayan/apps/checkouts/permissions.py index c40fbd44e7..0eb24c4b41 100644 --- a/mayan/apps/checkouts/permissions.py +++ b/mayan/apps/checkouts/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('checkouts', _('Document checkout')) +namespace = PermissionNamespace(name='checkouts', label=_('Document checkout')) permission_document_check_in = namespace.add_permission( name='checkin_document', label=_('Check in documents') diff --git a/mayan/apps/common/permissions_runtime.py b/mayan/apps/common/permissions_runtime.py index 25527c34cf..7113393edd 100644 --- a/mayan/apps/common/permissions_runtime.py +++ b/mayan/apps/common/permissions_runtime.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('common', _('Common')) +namespace = PermissionNamespace(name='common', label=_('Common')) permission_error_log_view = namespace.add_permission( name='error_log_view', label=_('View error log') diff --git a/mayan/apps/converter/permissions.py b/mayan/apps/converter/permissions.py index cbb575a0e9..4135d03949 100644 --- a/mayan/apps/converter/permissions.py +++ b/mayan/apps/converter/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('converter', _('Converter')) +namespace = PermissionNamespace(name='converter', label=_('Converter')) permission_transformation_create = namespace.add_permission( name='transformation_create', label=_('Create new transformations') diff --git a/mayan/apps/django_gpg/permissions.py b/mayan/apps/django_gpg/permissions.py index b6b1d14144..cc2fb04a3d 100644 --- a/mayan/apps/django_gpg/permissions.py +++ b/mayan/apps/django_gpg/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('django_gpg', _('Key management')) +namespace = PermissionNamespace(name='django_gpg', label=_('Key management')) permission_key_delete = namespace.add_permission( name='key_delete', label=_('Delete keys') diff --git a/mayan/apps/document_comments/permissions.py b/mayan/apps/document_comments/permissions.py index cdd02aa14b..c18b082ef0 100644 --- a/mayan/apps/document_comments/permissions.py +++ b/mayan/apps/document_comments/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('comments', _('Comments')) +namespace = PermissionNamespace(name='comments', label=_('Comments')) permission_comment_create = namespace.add_permission( name='comment_create', label=_('Create new comments') diff --git a/mayan/apps/document_indexing/permissions.py b/mayan/apps/document_indexing/permissions.py index f907bf6e13..1bab21761a 100644 --- a/mayan/apps/document_indexing/permissions.py +++ b/mayan/apps/document_indexing/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('document_indexing', _('Indexing')) +namespace = PermissionNamespace(name='document_indexing', label=_('Indexing')) permission_document_indexing_create = namespace.add_permission( name='document_index_create', label=_('Create new document indexes') diff --git a/mayan/apps/document_parsing/permissions.py b/mayan/apps/document_parsing/permissions.py index 5ae8c03744..3031daac19 100644 --- a/mayan/apps/document_parsing/permissions.py +++ b/mayan/apps/document_parsing/permissions.py @@ -4,7 +4,9 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('document_parsing', _('Document parsing')) +namespace = PermissionNamespace( + name='document_parsing', label=_('Document parsing') +) permission_content_view = namespace.add_permission( name='content_view', label=_('View the content of a document') diff --git a/mayan/apps/document_signatures/permissions.py b/mayan/apps/document_signatures/permissions.py index 4e8d5cd770..a4a43c0a07 100644 --- a/mayan/apps/document_signatures/permissions.py +++ b/mayan/apps/document_signatures/permissions.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace namespace = PermissionNamespace( - 'document_signatures', _('Document signatures') + name='document_signatures', _('Document signatures') ) permission_document_version_sign_detached = namespace.add_permission( diff --git a/mayan/apps/document_states/permissions.py b/mayan/apps/document_states/permissions.py index 4c37bcabf9..a500093d34 100644 --- a/mayan/apps/document_states/permissions.py +++ b/mayan/apps/document_states/permissions.py @@ -4,7 +4,9 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('document_states', _('Document workflows')) +namespace = PermissionNamespace( + name='document_states', label=_('Document workflows') +) permission_workflow_create = namespace.add_permission( name='workflow_create', label=_('Create workflows') diff --git a/mayan/apps/documents/permissions.py b/mayan/apps/documents/permissions.py index dc3d867f2b..0d7ecfdae6 100644 --- a/mayan/apps/documents/permissions.py +++ b/mayan/apps/documents/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('documents', _('Documents')) +namespace = PermissionNamespace(name='documents', label=_('Documents')) permission_document_create = namespace.add_permission( name='document_create', label=_('Create documents') @@ -52,7 +52,7 @@ permission_empty_trash = namespace.add_permission( ) setup_namespace = PermissionNamespace( - 'documents_types', label=_('Document types') + name='documents_types', label=_('Document types') ) permission_document_type_create = setup_namespace.add_permission( name='document_type_create', label=_('Create document types') diff --git a/mayan/apps/events/permissions.py b/mayan/apps/events/permissions.py index 92df60d901..c0953352d5 100644 --- a/mayan/apps/events/permissions.py +++ b/mayan/apps/events/permissions.py @@ -4,7 +4,8 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('events', _('Events')) +namespace = PermissionNamespace(name='events', label=_('Events')) + permission_events_view = namespace.add_permission( name='events_view', label=_('Access the events of an object') ) diff --git a/mayan/apps/linking/permissions.py b/mayan/apps/linking/permissions.py index 9709dd6be4..4111e42c5a 100644 --- a/mayan/apps/linking/permissions.py +++ b/mayan/apps/linking/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('linking', _('Smart links')) +namespace = PermissionNamespace(name='linking', label=_('Smart links')) permission_smart_link_view = namespace.add_permission( name='smart_link_view', label=_('View existing smart links') diff --git a/mayan/apps/mailer/permissions.py b/mayan/apps/mailer/permissions.py index fddd6f30b6..57cd9c6422 100644 --- a/mayan/apps/mailer/permissions.py +++ b/mayan/apps/mailer/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('mailing', _('Mailing')) +namespace = PermissionNamespace(name='mailing', label=_('Mailing')) permission_mailing_link = namespace.add_permission( name='mail_link', label=_('Send document link via email') diff --git a/mayan/apps/mayan_statistics/permissions.py b/mayan/apps/mayan_statistics/permissions.py index 6cd42d3361..453eeeaeae 100644 --- a/mayan/apps/mayan_statistics/permissions.py +++ b/mayan/apps/mayan_statistics/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('statistics', _('Statistics')) +namespace = PermissionNamespace(name='statistics', label=_('Statistics')) permission_statistics_view = namespace.add_permission( name='statistics_view', label=_('View statistics') diff --git a/mayan/apps/metadata/permissions.py b/mayan/apps/metadata/permissions.py index d39128ed60..82d6275349 100644 --- a/mayan/apps/metadata/permissions.py +++ b/mayan/apps/metadata/permissions.py @@ -4,7 +4,8 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('metadata', _('Metadata')) +namespace = PermissionNamespace(name='metadata', label=_('Metadata')) + permission_metadata_document_edit = namespace.add_permission( name='metadata_document_edit', label=_('Edit a document\'s metadata') ) @@ -18,7 +19,10 @@ permission_metadata_document_view = namespace.add_permission( name='metadata_document_view', label=_('View metadata from a document') ) -setup_namespace = PermissionNamespace('metadata_setup', _('Metadata setup')) +setup_namespace = PermissionNamespace( + name='metadata_setup', label=_('Metadata setup') +) + permission_metadata_type_edit = setup_namespace.add_permission( name='metadata_type_edit', label=_('Edit metadata types') ) diff --git a/mayan/apps/motd/permissions.py b/mayan/apps/motd/permissions.py index 00b6e50611..da60db4e8d 100644 --- a/mayan/apps/motd/permissions.py +++ b/mayan/apps/motd/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('motd', _('Message of the day')) +namespace = PermissionNamespace(name='motd', label=_('Message of the day')) permission_message_create = namespace.add_permission( name='message_create', label=_('Create messages') diff --git a/mayan/apps/ocr/permissions.py b/mayan/apps/ocr/permissions.py index 669b932157..d27eedc56e 100644 --- a/mayan/apps/ocr/permissions.py +++ b/mayan/apps/ocr/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('ocr', _('OCR')) +namespace = PermissionNamespace(name='ocr', label=_('OCR')) permission_ocr_document = namespace.add_permission( name='ocr_document', label=_('Submit documents for OCR') diff --git a/mayan/apps/permissions/permissions.py b/mayan/apps/permissions/permissions.py index 3d1ee0c371..be41eee779 100644 --- a/mayan/apps/permissions/permissions.py +++ b/mayan/apps/permissions/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from . import PermissionNamespace -namespace = PermissionNamespace('permissions', _('Permissions')) +namespace = PermissionNamespace(name='permissions', label=_('Permissions')) permission_role_view = namespace.add_permission( name='role_view', label=_('View roles') diff --git a/mayan/apps/smart_settings/permissions.py b/mayan/apps/smart_settings/permissions.py index e14544944a..b1426603f0 100644 --- a/mayan/apps/smart_settings/permissions.py +++ b/mayan/apps/smart_settings/permissions.py @@ -4,7 +4,9 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('smart_settings', _('Smart settings')) +namespace = PermissionNamespace( + name='smart_settings', label=_('Smart settings') +) permission_settings_edit = namespace.add_permission( name='permission_settings_edit', label=_('Edit settings') diff --git a/mayan/apps/sources/permissions.py b/mayan/apps/sources/permissions.py index 2d09a8a5e7..a6d35ec03d 100644 --- a/mayan/apps/sources/permissions.py +++ b/mayan/apps/sources/permissions.py @@ -4,7 +4,8 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('sources_setup', _('Sources setup')) +namespace = PermissionNamespace(name='sources_setup', label=_('Sources setup')) + permission_sources_setup_create = namespace.add_permission( name='sources_setup_create', label=_('Create new document sources') ) diff --git a/mayan/apps/tags/permissions.py b/mayan/apps/tags/permissions.py index 3d498787dc..aa4b895def 100644 --- a/mayan/apps/tags/permissions.py +++ b/mayan/apps/tags/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('tags', _('Tags')) +namespace = PermissionNamespace(name='tags', label=_('Tags')) permission_tag_create = namespace.add_permission( name='tag_create', label=_('Create new tags') diff --git a/mayan/apps/task_manager/permissions.py b/mayan/apps/task_manager/permissions.py index 31e6765690..bb6d7bcf6d 100644 --- a/mayan/apps/task_manager/permissions.py +++ b/mayan/apps/task_manager/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('task_manager', _('Task manager')) +namespace = PermissionNamespace(name='task_manager', label=_('Task manager')) permission_task_view = namespace.add_permission( name='task_view', label=_('View tasks') diff --git a/mayan/apps/user_management/permissions.py b/mayan/apps/user_management/permissions.py index e2eca5f948..a6be8ae190 100644 --- a/mayan/apps/user_management/permissions.py +++ b/mayan/apps/user_management/permissions.py @@ -4,7 +4,9 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('user_management', _('User management')) +namespace = PermissionNamespace( + name='user_management', label=_('User management') +) permission_group_create = namespace.add_permission( name='group_create', label=_('Create new groups')