diff --git a/mayan/apps/common/mixins.py b/mayan/apps/common/mixins.py index 37369a80af..4c1120b081 100644 --- a/mayan/apps/common/mixins.py +++ b/mayan/apps/common/mixins.py @@ -75,12 +75,11 @@ class RedirectionMixin(object): return context class ViewPermissionCheckMixin(object): - permissions_required = None - # TODO: rename this to view_permission + view_permission = None def dispatch(self, request, *args, **kwargs): - if self.permissions_required: - Permission.objects.check_permissions(self.request.user, self.permissions_required) + if self.view_permission: + Permission.objects.check_permissions(self.request.user, [self.view_permission]) return super(ViewPermissionCheckMixin, self).dispatch(request, *args, **kwargs) diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py index b2d4327259..7a389b8462 100644 --- a/mayan/apps/permissions/views.py +++ b/mayan/apps/permissions/views.py @@ -33,19 +33,19 @@ from .permissions import (PERMISSION_PERMISSION_GRANT, class RoleCreateView(SingleObjectCreateView): form_class = RoleForm model = Role - permissions_required = [PERMISSION_ROLE_CREATE] + view_permission = PERMISSION_ROLE_CREATE success_url = reverse_lazy('permissions:role_list') class RoleDeleteView(SingleObjectDeleteView): model = Role - permissions_required = [PERMISSION_ROLE_DELETE] + view_permission = PERMISSION_ROLE_DELETE success_url = reverse_lazy('permissions:role_list') class RoleEditView(SingleObjectEditView): model = Role - permissions_required = [PERMISSION_ROLE_EDIT] + view_permission = PERMISSION_ROLE_EDIT def role_list(request): diff --git a/mayan/apps/sources/wizards.py b/mayan/apps/sources/wizards.py index 0477016012..e2d39772c5 100644 --- a/mayan/apps/sources/wizards.py +++ b/mayan/apps/sources/wizards.py @@ -19,7 +19,7 @@ class DocumentCreateWizard(ViewPermissionCheckMixin, SessionWizardView): form_list = [DocumentTypeSelectForm, MetadataFormSet] template_name = 'main/generic_wizard.html' extra_context = {} - permissions_required = [PERMISSION_DOCUMENT_CREATE] + view_permission = PERMISSION_DOCUMENT_CREATE @staticmethod def _has_metadata_types(wizard):