Styling: PermissionNamespace keyword arguments

Add keyword arguments to all called instances of PermissionNamespace.
Sort name and label arguments.

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2018-12-14 21:46:07 -04:00
parent 3adb9d4ea0
commit 8c63ef4c69
30 changed files with 40 additions and 37 deletions

View File

@@ -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(label=_('Access control lists'), name='acls')
permission_acl_edit = namespace.add_permission(
name='acl_edit', label=_('Edit ACLs')

View File

@@ -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

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('cabinets', _('Cabinets'))
namespace = PermissionNamespace(label=_('Cabinets'), name='cabinets')
# Translators: this refers to the permission that will allow users to add
# documents to cabinets.

View File

@@ -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(label=_('Document checkout'), name='checkouts')
permission_document_checkin = namespace.add_permission(
name='checkin_document', label=_('Check in documents')

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('common', _('Common'))
namespace = PermissionNamespace(label=_('Common'), name='common')
permission_error_log_view = namespace.add_permission(
name='error_log_view', label=_('View error log')

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('converter', _('Converter'))
namespace = PermissionNamespace(label=_('Converter'), name='converter')
permission_transformation_create = namespace.add_permission(
name='transformation_create', label=_('Create new transformations')

View File

@@ -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(label=_('Key management'), name='django_gpg')
permission_key_delete = namespace.add_permission(
name='key_delete', label=_('Delete keys')

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('comments', _('Comments'))
namespace = PermissionNamespace(label=_('Comments'), name='comments')
permission_comment_create = namespace.add_permission(
name='comment_create', label=_('Create new comments')

View File

@@ -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(label=_('Indexing'), name='document_indexing')
permission_document_indexing_create = namespace.add_permission(
name='document_index_create', label=_('Create new document indexes')

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('document_parsing', _('Document parsing'))
namespace = PermissionNamespace(label=_('Document parsing'), name='document_parsing')
permission_content_view = namespace.add_permission(
name='content_view', label=_('View the content of a document')

View File

@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace(
'document_signatures', _('Document signatures')
label=_('Document signatures'), name='document_signatures'
)
permission_document_version_sign_detached = namespace.add_permission(

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('document_states', _('Document workflows'))
namespace = PermissionNamespace(label=_('Document workflows'), name='document_states')
permission_workflow_create = namespace.add_permission(
name='workflow_create', label=_('Create workflows')

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('documents', _('Documents'))
namespace = PermissionNamespace(label=_('Documents'), name='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')
label=_('Document types'), name='documents_types'
)
permission_document_type_create = setup_namespace.add_permission(
name='document_type_create', label=_('Create document types')

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('events', _('Events'))
namespace = PermissionNamespace(label=_('Events'), name='events')
permission_events_view = namespace.add_permission(
name='events_view', label=_('Access the events of an object')
)

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('file_metadata', _('File metadata'))
namespace = PermissionNamespace(label=_('File metadata'), name='file_metadata')
permission_document_type_file_metadata_setup = namespace.add_permission(
name='file_metadata_document_type_setup',

View File

@@ -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(label=_('Smart links'), name='linking')
permission_smart_link_view = namespace.add_permission(
name='smart_link_view', label=_('View existing smart links')

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('mailing', _('Mailing'))
namespace = PermissionNamespace(label=_('Mailing'), name='mailing')
permission_mailing_link = namespace.add_permission(
name='mail_link', label=_('Send document link via email')

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('statistics', _('Statistics'))
namespace = PermissionNamespace(label=_('Statistics'), name='statistics')
permission_statistics_view = namespace.add_permission(
name='statistics_view', label=_('View statistics')

View File

@@ -4,7 +4,8 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('metadata', _('Metadata'))
namespace = PermissionNamespace(label=_('Metadata'), name='metadata')
permission_metadata_document_edit = namespace.add_permission(
name='metadata_document_edit', label=_('Edit a document\'s metadata')
)
@@ -18,7 +19,8 @@ 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(label=_('Metadata setup'), name='metadata_setup')
permission_metadata_type_edit = setup_namespace.add_permission(
name='metadata_type_edit', label=_('Edit metadata types')
)

View File

@@ -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(label=_('Message of the day'), name='motd')
permission_message_create = namespace.add_permission(
name='message_create', label=_('Create messages')

View File

@@ -27,7 +27,7 @@ class LinkClassTestCase(GenericViewTestCase):
self.add_test_view(test_object=self.group)
self.namespace = PermissionNamespace(
TEST_PERMISSION_NAMESPACE_NAME, TEST_PERMISSION_NAMESPACE_TEXT
label=TEST_PERMISSION_NAMESPACE_TEXT, name=TEST_PERMISSION_NAMESPACE_NAME
)
self.permission = self.namespace.add_permission(
@@ -159,7 +159,7 @@ class MenuClassTestCase(GenericViewTestCase):
self.add_test_view(test_object=self.group)
self.namespace = PermissionNamespace(
TEST_PERMISSION_NAMESPACE_NAME, TEST_PERMISSION_NAMESPACE_TEXT
label=TEST_PERMISSION_NAMESPACE_TEXT, name=TEST_PERMISSION_NAMESPACE_NAME
)
self.permission = self.namespace.add_permission(

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('ocr', _('OCR'))
namespace = PermissionNamespace(label=_('OCR'), name='ocr')
permission_ocr_document = namespace.add_permission(
name='ocr_document', label=_('Submit documents for OCR')

View File

@@ -32,9 +32,9 @@ class PermissionNamespace(object):
'"purgepermissions" and try again.'
)
def __init__(self, name, label):
self.name = name
def __init__(self, label, name):
self.label = label
self.name = name
self.permissions = []
self.__class__._registry[name] = self
@@ -83,9 +83,9 @@ class Permission(object):
if permissions.stored_permission.requester_has_this(requester):
return True
logger.debug('User "%s" does not have permissions "%s"',
requester,
permissions)
logger.debug(
'User "%s" does not have permissions "%s"', requester, permissions
)
raise PermissionDenied(_('Insufficient permissions.'))
@classmethod

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from . import PermissionNamespace
namespace = PermissionNamespace('permissions', _('Permissions'))
namespace = PermissionNamespace(label=_('Permissions'), name='permissions')
permission_role_view = namespace.add_permission(
name='role_view', label=_('View roles')

View File

@@ -139,7 +139,7 @@ class SetupRolePermissionsView(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

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('smart_settings', _('Smart settings'))
namespace = PermissionNamespace(label=_('Smart settings'), name='smart_settings')
permission_settings_edit = namespace.add_permission(
name='permission_settings_edit', label=_('Edit settings')

View File

@@ -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(label=_('Sources setup'), name='source_setup')
permission_sources_setup_create = namespace.add_permission(
name='sources_setup_create', label=_('Create new document sources')
)

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('tags', _('Tags'))
namespace = PermissionNamespace(label=_('Tags'), name='tags')
permission_tag_create = namespace.add_permission(
name='tag_create', label=_('Create new tags')

View File

@@ -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(label=_('Task manager'), name='task_manager')
permission_task_view = namespace.add_permission(
name='task_view', label=_('View tasks')

View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace('user_management', _('User management'))
namespace = PermissionNamespace(label=_('User management'), name='user_management')
permission_group_create = namespace.add_permission(
name='group_create', label=_('Create new groups')