From 53096b8bdd5bfa371382a26bfd002757b84f1b61 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sun, 13 Oct 2019 15:34:32 -0400 Subject: [PATCH] Allow "Execute document tools" permission via ACL Signed-off-by: Roberto Rosario --- HISTORY.rst | 3 +++ mayan/apps/documents/apps.py | 12 ++++++------ mayan/apps/documents/tests/test_document_views.py | 8 ++++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index a61fdd6a1e..1fd8e03268 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -80,6 +80,9 @@ Deploy a Redis container. - Improve document version upload form. - Use dropzone for document version upload form. +- Allow the "Execute document tools" permission to be + granted via ACL. + 3.2.8 (2019-10-01) ================== diff --git a/mayan/apps/documents/apps.py b/mayan/apps/documents/apps.py index 09e85928c7..df81395c11 100644 --- a/mayan/apps/documents/apps.py +++ b/mayan/apps/documents/apps.py @@ -87,10 +87,10 @@ from .permissions import ( permission_document_download, permission_document_edit, permission_document_new_version, permission_document_print, permission_document_properties_edit, permission_document_restore, - permission_document_trash, permission_document_type_delete, - permission_document_type_edit, permission_document_type_view, - permission_document_version_revert, permission_document_version_view, - permission_document_view + permission_document_tools, permission_document_trash, + permission_document_type_delete, permission_document_type_edit, + permission_document_type_view, permission_document_version_revert, + permission_document_version_view, permission_document_view ) # Just import to initialize the search models from .search import document_search, document_page_search # NOQA @@ -191,8 +191,8 @@ class DocumentsApp(MayanAppConfig): permission_document_delete, permission_document_download, permission_document_edit, permission_document_new_version, permission_document_print, permission_document_properties_edit, - permission_document_restore, permission_document_trash, - permission_document_version_revert, + permission_document_restore, permission_document_tools, + permission_document_trash, permission_document_version_revert, permission_document_version_view, permission_document_view, permission_events_view, permission_transformation_create, permission_transformation_delete, diff --git a/mayan/apps/documents/tests/test_document_views.py b/mayan/apps/documents/tests/test_document_views.py index 6d6444cd42..2a6c94093e 100644 --- a/mayan/apps/documents/tests/test_document_views.py +++ b/mayan/apps/documents/tests/test_document_views.py @@ -301,7 +301,9 @@ class DocumentViewTestCase( self.test_document.pages.all().delete() self.assertEqual(self.test_document.pages.count(), 0) - self.grant_permission(permission=permission_document_tools) + self.grant_access( + obj=self.test_document, permission=permission_document_tools + ) response = self._request_document_update_page_count_view() self.assertEqual(response.status_code, 302) @@ -322,7 +324,9 @@ class DocumentViewTestCase( self.test_document.pages.all().delete() self.assertEqual(self.test_document.pages.count(), 0) - self.grant_permission(permission=permission_document_tools) + self.grant_access( + obj=self.test_document, permission=permission_document_tools + ) response = self._request_document_multiple_update_page_count_view() self.assertEqual(response.status_code, 302)