From d422da2c435dfe524f32c9dd8b536e8dcc4f60c2 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 14 Jul 2017 22:43:45 -0400 Subject: [PATCH] Apply the tag attach and remove permissions to tags too. Signed-off-by: Roberto Rosario --- mayan/apps/tags/apps.py | 5 +++-- mayan/apps/tags/views.py | 24 ++++++++++++++---------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/mayan/apps/tags/apps.py b/mayan/apps/tags/apps.py index b09ef5af0a..94dd256fef 100644 --- a/mayan/apps/tags/apps.py +++ b/mayan/apps/tags/apps.py @@ -65,8 +65,9 @@ class TagsApp(MayanAppConfig): ModelPermission.register( model=Tag, permissions=( permission_acl_edit, permission_acl_view, - permission_tag_delete, permission_tag_edit, - permission_tag_view, + permission_tag_attach, permission_tag_delete, + permission_tag_edit, permission_tag_remove, + permission_tag_view ) ) diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py index 9c378ad38a..ee166d4479 100644 --- a/mayan/apps/tags/views.py +++ b/mayan/apps/tags/views.py @@ -41,10 +41,12 @@ class TagAttachActionView(MultipleObjectFormActionView): result = { 'submit_label': _('Attach'), 'title': ungettext( - 'Attach tags to document', - 'Attach tags to documents', - queryset.count() - ) + singular='Attach tags to %(count)d document', + plural='Attach tags to %(count)d documents', + number=queryset.count() + ) % { + 'count': queryset.count(), + } } if queryset.count() == 1: @@ -78,7 +80,7 @@ class TagAttachActionView(MultipleObjectFormActionView): for tag in form.cleaned_data['tags']: AccessControlList.objects.check_access( - obj=tag, permissions=permission_tag_view, + obj=tag, permissions=permission_tag_attach, user=self.request.user ) @@ -245,10 +247,12 @@ class TagRemoveActionView(MultipleObjectFormActionView): result = { 'submit_label': _('Remove'), 'title': ungettext( - 'Remove tags from document', - 'Remove tags from documents', - queryset.count() - ) + singular='Remove tags to %(count)d document', + plural='Remove tags to %(count)d documents', + number=queryset.count() + ) % { + 'count': queryset.count(), + } } if queryset.count() == 1: @@ -282,7 +286,7 @@ class TagRemoveActionView(MultipleObjectFormActionView): for tag in form.cleaned_data['tags']: AccessControlList.objects.check_access( - obj=tag, permissions=permission_tag_view, + obj=tag, permissions=permission_tag_remove, user=self.request.user )