diff --git a/mayan/apps/acls/links.py b/mayan/apps/acls/links.py index adebdea8fb..865fc822bb 100644 --- a/mayan/apps/acls/links.py +++ b/mayan/apps/acls/links.py @@ -30,21 +30,20 @@ def get_kwargs_factory(variable_name): link_acl_delete = Link( icon_class=icon_acl_delete, kwargs={'acl_id': 'resolved_object.pk'}, - permissions=(permission_acl_edit,), permissions_related='content_object', - tags='dangerous', text=_('Delete'), view='acls:acl_delete', + permission=permission_acl_edit, tags='dangerous', text=_('Delete'), + view='acls:acl_delete', ) link_acl_list = Link( icon_class=icon_acl_list, kwargs=get_kwargs_factory( variable_name='resolved_object' - ), permissions=(permission_acl_view,), text=_('ACLs'), view='acls:acl_list' + ), permission=permission_acl_view, text=_('ACLs'), view='acls:acl_list' ) link_acl_create = Link( icon_class=icon_acl_new, kwargs=get_kwargs_factory('resolved_object'), - permissions=(permission_acl_edit,), text=_('New ACL'), - view='acls:acl_create' + permission=permission_acl_edit, text=_('New ACL'), view='acls:acl_create' ) link_acl_permissions = Link( args='resolved_object.pk', icon_class=icon_permission, - permissions=(permission_acl_edit,), permissions_related='content_object', - text=_('Permissions'), view='acls:acl_permissions', + permission=permission_acl_edit, text=_('Permissions'), + view='acls:acl_permissions', ) diff --git a/mayan/apps/cabinets/links.py b/mayan/apps/cabinets/links.py index bdf0a25294..56f01aad3b 100644 --- a/mayan/apps/cabinets/links.py +++ b/mayan/apps/cabinets/links.py @@ -24,17 +24,17 @@ from .permissions import ( link_document_cabinet_list = Link( args='resolved_object.pk', icon_class=icon_cabinet_list, - permissions=(permission_document_view,), - text=_('Cabinets'), view='cabinets:document_cabinet_list', + permission=permission_document_view, text=_('Cabinets'), + view='cabinets:document_cabinet_list', ) link_document_cabinet_remove = Link( args='resolved_object.pk', icon_class=icon_document_cabinet_remove, - permissions=(permission_cabinet_remove_document,), + permission=permission_cabinet_remove_document, text=_('Remove from cabinets'), view='cabinets:document_cabinet_remove' ) link_document_cabinet_add = Link( args='object.pk', icon_class=icon_document_cabinet_add, - permissions=(permission_cabinet_add_document,), text=_('Add to cabinets'), + permission=permission_cabinet_add_document, text=_('Add to cabinets'), view='cabinets:document_cabinet_add', ) link_document_multiple_cabinet_add = Link( @@ -61,21 +61,21 @@ link_custom_acl_list.condition = cabinet_is_root link_cabinet_child_add = Link( args='object.pk', icon_class=icon_cabinet_child_add, - permissions=(permission_cabinet_create,), text=_('Add new level'), + permission=permission_cabinet_create, text=_('Add new level'), view='cabinets:cabinet_child_add' ) link_cabinet_create = Link( - icon_class=icon_cabinet_create, permissions=(permission_cabinet_create,), + icon_class=icon_cabinet_create, permission=permission_cabinet_create, text=_('Create cabinet'), view='cabinets:cabinet_create' ) link_cabinet_delete = Link( args='object.pk', icon_class=icon_cabinet_delete, - permissions=(permission_cabinet_delete,), tags='dangerous', + permission=permission_cabinet_delete, tags='dangerous', text=_('Delete'), view='cabinets:cabinet_delete' ) link_cabinet_edit = Link( args='object.pk', icon_class=icon_cabinet_edit, - permissions=(permission_cabinet_edit,), text=_('Edit'), + permission=permission_cabinet_edit, text=_('Edit'), view='cabinets:cabinet_edit' ) link_cabinet_list = Link( @@ -87,6 +87,6 @@ link_cabinet_list = Link( ) link_cabinet_view = Link( args='object.pk', icon_class=icon_cabinet_view, - permissions=(permission_cabinet_view,), text=_('Details'), + permission=permission_cabinet_view, text=_('Details'), view='cabinets:cabinet_view' ) diff --git a/mayan/apps/checkouts/links.py b/mayan/apps/checkouts/links.py index 1ed63fc666..b6ef58de91 100644 --- a/mayan/apps/checkouts/links.py +++ b/mayan/apps/checkouts/links.py @@ -9,7 +9,7 @@ from .icons import ( ) from .permissions import ( permission_document_checkin, permission_document_checkin_override, - permission_document_checkout + permission_document_checkout, permission_document_checkout_detail_view ) @@ -36,19 +36,16 @@ link_checkout_list = Link( link_checkout_document = Link( args='object.pk', condition=is_not_checked_out, icon_class=icon_checkout_document, - permissions=(permission_document_checkout,), text=_('Check out document'), + permission=permission_document_checkout, text=_('Check out document'), view='checkouts:checkout_document', ) link_checkin_document = Link( args='object.pk', condition=is_checked_out, - icon_class=icon_checkin_document, permissions=( - permission_document_checkin, permission_document_checkin_override - ), text=_('Check in document'), view='checkouts:checkin_document', - + icon_class=icon_checkin_document, permission=permission_document_checkin, + text=_('Check in document'), view='checkouts:checkin_document', ) link_checkout_info = Link( - args='resolved_object.pk', icon_class=icon_checkout_info, permissions=( - permission_document_checkin, permission_document_checkin_override, - permission_document_checkout - ), text=_('Check in/out'), view='checkouts:checkout_info', + args='resolved_object.pk', icon_class=icon_checkout_info, + permission=permission_document_checkout_detail_view, + text=_('Check in/out'), view='checkouts:checkout_info', ) diff --git a/mayan/apps/common/links.py b/mayan/apps/common/links.py index 0f58551f10..78fbe193c9 100644 --- a/mayan/apps/common/links.py +++ b/mayan/apps/common/links.py @@ -57,12 +57,12 @@ link_documentation = Link( link_object_error_list = Link( icon_class=icon_object_error_list, kwargs=get_kwargs_factory('resolved_object'), - permissions=(permission_error_log_view,), text=_('Errors'), + permission=permission_error_log_view, text=_('Errors'), view='common:object_error_list', ) link_object_error_list_clear = Link( kwargs=get_kwargs_factory('resolved_object'), - permissions=(permission_error_log_view,), text=_('Clear all'), + permission=permission_error_log_view, text=_('Clear all'), view='common:object_error_list_clear', ) link_forum = Link( diff --git a/mayan/apps/converter/links.py b/mayan/apps/converter/links.py index 85dc35778c..99ab3cef71 100644 --- a/mayan/apps/converter/links.py +++ b/mayan/apps/converter/links.py @@ -33,20 +33,20 @@ def get_kwargs_factory(variable_name): link_transformation_create = Link( icon_class=icon_transformation_create, kwargs=get_kwargs_factory('content_object'), - permissions=(permission_transformation_create,), + permission=permission_transformation_create, text=_('Create new transformation'), view='converter:transformation_create' ) link_transformation_delete = Link( - args='resolved_object.pk', permissions=(permission_transformation_delete,), + args='resolved_object.pk', permission=permission_transformation_delete, tags='dangerous', text=_('Delete'), view='converter:transformation_delete' ) link_transformation_edit = Link( - args='resolved_object.pk', permissions=(permission_transformation_edit,), + args='resolved_object.pk', permission=permission_transformation_edit, text=_('Edit'), view='converter:transformation_edit' ) link_transformation_list = Link( icon_class=icon_transformation, kwargs=get_kwargs_factory('resolved_object'), - permissions=(permission_transformation_view,), text=_('Transformations'), + permission=permission_transformation_view, text=_('Transformations'), view='converter:transformation_list' ) diff --git a/mayan/apps/django_gpg/links.py b/mayan/apps/django_gpg/links.py index 08264795d3..1a9d2811a1 100644 --- a/mayan/apps/django_gpg/links.py +++ b/mayan/apps/django_gpg/links.py @@ -12,41 +12,40 @@ from .permissions import ( link_key_delete = Link( kwargs={'key_id': 'resolved_object.pk'}, - permissions=(permission_key_delete,), tags='dangerous', text=_('Delete'), + permission=permission_key_delete, tags='dangerous', text=_('Delete'), view='django_gpg:key_delete' ) link_key_detail = Link( - kwargs={'key_id': 'resolved_object.pk'}, permissions=(permission_key_view,), + kwargs={'key_id': 'resolved_object.pk'}, permission=permission_key_view, text=_('Details'), view='django_gpg:key_detail' ) link_key_download = Link( kwargs={'key_id': 'resolved_object.pk'}, - permissions=(permission_key_download,), text=_('Download'), + permission=permission_key_download, text=_('Download'), view='django_gpg:key_download' ) link_key_query = Link( - icon_class=icon_keyserver_search, - permissions=(permission_keyserver_query,), text=_('Query keyservers'), - view='django_gpg:key_query' + icon_class=icon_keyserver_search, permission=permission_keyserver_query, + text=_('Query keyservers'), view='django_gpg:key_query' ) link_key_receive = Link( keep_query=True, kwargs={'key_id': 'object.key_id'}, - permissions=(permission_key_receive,), text=_('Import'), + permission=permission_key_receive, text=_('Import'), view='django_gpg:key_receive', ) link_key_setup = Link( - icon_class=icon_key_setup, permissions=(permission_key_view,), + icon_class=icon_key_setup, permission=permission_key_view, text=_('Key management'), view='django_gpg:key_public_list' ) link_key_upload = Link( - icon_class=icon_key_upload, permissions=(permission_key_upload,), + icon_class=icon_key_upload, permission=permission_key_upload, text=_('Upload key'), view='django_gpg:key_upload' ) link_private_keys = Link( - permissions=(permission_key_view,), text=_('Private keys'), + permission=permission_key_view, text=_('Private keys'), view='django_gpg:key_private_list' ) link_public_keys = Link( - permissions=(permission_key_view,), text=_('Public keys'), + permission=permission_key_view, text=_('Public keys'), view='django_gpg:key_public_list' ) diff --git a/mayan/apps/document_comments/links.py b/mayan/apps/document_comments/links.py index 58238f88e1..e344d55f6a 100644 --- a/mayan/apps/document_comments/links.py +++ b/mayan/apps/document_comments/links.py @@ -14,17 +14,17 @@ from .permissions import ( link_comment_add = Link( icon_class=icon_comment_add, kwargs={'document_id': 'object.pk'}, - permissions=(permission_comment_create,), text=_('Add comment'), + permission=permission_comment_create, text=_('Add comment'), view='comments:comment_add', ) link_comment_delete = Link( icon_class=icon_comment_delete, kwargs={'comment_id': 'object.pk'}, - permissions=(permission_comment_delete,), tags='dangerous', + permission=permission_comment_delete, tags='dangerous', text=_('Delete'), view='comments:comment_delete', ) link_comments_for_document = Link( icon_class=icon_comments_for_document, kwargs={'document_id': 'resolved_object.pk'}, - permissions=(permission_comment_view,), text=_('Comments'), + permission=permission_comment_view, text=_('Comments'), view='comments:comments_for_document', ) diff --git a/mayan/apps/document_indexing/links.py b/mayan/apps/document_indexing/links.py index 9427423150..cde0f1ab43 100644 --- a/mayan/apps/document_indexing/links.py +++ b/mayan/apps/document_indexing/links.py @@ -45,27 +45,27 @@ link_index_setup_list = Link( ) link_index_setup_create = Link( icon_class=icon_index_create, - permissions=(permission_document_indexing_create,), text=_('Create index'), + permission=permission_document_indexing_create, text=_('Create index'), view='indexing:index_setup_create' ) link_index_setup_edit = Link( args='resolved_object.pk', - permissions=(permission_document_indexing_edit,), text=_('Edit'), + permission=permission_document_indexing_edit, text=_('Edit'), view='indexing:index_setup_edit', ) link_index_setup_delete = Link( args='resolved_object.pk', - permissions=(permission_document_indexing_delete,), tags='dangerous', + permission=permission_document_indexing_delete, tags='dangerous', text=_('Delete'), view='indexing:index_setup_delete', ) link_index_setup_view = Link( args='resolved_object.pk', icon_class=icon_index_setup_view, - permissions=(permission_document_indexing_edit,), text=_('Tree template'), + permission=permission_document_indexing_edit, text=_('Tree template'), view='indexing:index_setup_view', ) link_index_setup_document_types = Link( args='resolved_object.pk', icon_class=icon_document_type, - permissions=(permission_document_indexing_edit,), text=_('Document types'), + permission=permission_document_indexing_edit, text=_('Document types'), view='indexing:index_setup_document_types', ) link_rebuild_index_instances = Link( diff --git a/mayan/apps/document_parsing/links.py b/mayan/apps/document_parsing/links.py index ac2cf20d7b..7d2100d2f1 100644 --- a/mayan/apps/document_parsing/links.py +++ b/mayan/apps/document_parsing/links.py @@ -18,25 +18,25 @@ from .permissions import ( link_document_content = Link( icon_class=icon_document_content, kwargs={'document_id': 'resolved_object.id'}, - permissions=(permission_content_view,), text=_('Content'), + permission=permission_content_view, text=_('Content'), view='document_parsing:document_content', ) link_document_page_content = Link( icon_class=icon_document_content, kwargs={'document_page_id': 'resolved_object.id'}, - permissions=(permission_content_view,), text=_('Content'), + permission=permission_content_view, text=_('Content'), view='document_parsing:document_page_content', ) link_document_parsing_errors_list = Link( icon_class=icon_document_parsing_errors_list, kwargs={'document_id': 'resolved_object.id'}, - permissions=(permission_content_view,), text=_('Parsing errors'), + permission=permission_content_view, text=_('Parsing errors'), view='document_parsing:document_parsing_error_list' ) link_document_content_download = Link( icon_class=icon_document_content_download, kwargs={'document_id': 'resolved_object.id'}, - permissions=(permission_content_view,), text=_('Download content'), + permission=permission_content_view, text=_('Download content'), view='document_parsing:document_content_download' ) link_document_multiple_submit = Link( @@ -46,13 +46,13 @@ link_document_multiple_submit = Link( link_document_submit = Link( icon_class=icon_document_submit, kwargs={'document_id': 'resolved_object.id'}, - permissions=(permission_parse_document,), + permission=permission_parse_document, text=_('Submit for parsing'), view='document_parsing:document_submit' ) link_document_type_parsing_settings = Link( icon_class=icon_document_type_parsing_settings, kwargs={'document_type_id': 'resolved_object.id'}, - permissions=(permission_document_type_parsing_setup,), + permission=permission_document_type_parsing_setup, text=_('Setup parsing'), view='document_parsing:document_type_parsing_settings', ) @@ -65,6 +65,6 @@ link_document_type_submit = Link( view='document_parsing:document_type_submit' ) link_error_list = Link( - icon_class=icon_link_error_list, permissions=(permission_content_view,), + icon_class=icon_link_error_list, permission=permission_content_view, text=_('Parsing errors'), view='document_parsing:error_list' ) diff --git a/mayan/apps/document_signatures/links.py b/mayan/apps/document_signatures/links.py index 60a2fcffd9..7ffdaaa12c 100644 --- a/mayan/apps/document_signatures/links.py +++ b/mayan/apps/document_signatures/links.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -from django.apps import apps from django.utils.translation import ugettext_lazy as _ from mayan.apps.navigation import Link @@ -9,8 +8,9 @@ from .icons import ( icon_all_document_version_signature_verify, icon_document_signature_list, link_document_version_signature_detached_create, icon_document_version_signature_embedded_create, - icon_document_version_signature_list + icon_document_version_signature_list, icon_document_version_signature_upload ) +from .literals import SIGNATURE_TYPE_DETACHED from .permissions import ( permission_document_version_sign_detached, permission_document_version_sign_embedded, @@ -23,69 +23,63 @@ from .permissions import ( def is_detached_signature(context): - SignatureBaseModel = apps.get_model( - app_label='document_signatures', model_name='SignatureBaseModel' - ) - - return SignatureBaseModel.objects.select_subclasses().get( - pk=context['object'].pk - ).is_detached + return context['object'].signature_type == SIGNATURE_TYPE_DETACHED link_all_document_version_signature_verify = Link( icon_class=icon_all_document_version_signature_verify, - permissions=(permission_document_version_signature_verify,), + permission=permission_document_version_signature_verify, text=_('Verify all documents'), - view='signatures:all_document_version_signature_verify', + view='signatures:all_document_version_signature_verify' ) link_document_signature_list = Link( - args='resolved_object.latest_version.pk', icon_class=icon_document_signature_list, - permissions=(permission_document_version_signature_view,), - text=_('Signatures'), view='signatures:document_version_signature_list', + kwargs={'document_version_id': 'resolved_object.latest_version.pk'}, + permission=permission_document_version_signature_view, + text=_('Signatures'), view='signatures:document_version_signature_list' ) link_document_version_signature_delete = Link( - args='resolved_object.pk', condition=is_detached_signature, - permissions=(permission_document_version_signature_delete,), - permissions_related='document_version.document', tags='dangerous', - text=_('Delete'), view='signatures:document_version_signature_delete', + condition=is_detached_signature, + kwargs={'signature_id': 'resolved_object.pk'}, + permission=permission_document_version_signature_delete, + tags='dangerous', text=_('Delete'), + view='signatures:document_version_signature_delete' ) link_document_version_signature_details = Link( - args='resolved_object.pk', - permissions=(permission_document_version_signature_view,), - permissions_related='document_version.document', text=_('Details'), - view='signatures:document_version_signature_details', + kwargs={'signature_id': 'resolved_object.pk'}, + permission=permission_document_version_signature_view, + text=_('Details'), view='signatures:document_version_signature_details' ) link_document_version_signature_list = Link( - args='resolved_object.pk', icon_class=icon_document_version_signature_list, - permissions=(permission_document_version_signature_view,), - permissions_related='document', text=_('Signatures'), - view='signatures:document_version_signature_list', + kwargs={'document_version_id': 'resolved_object.pk'}, + permission=permission_document_version_signature_view, + text=_('Signatures'), view='signatures:document_version_signature_list' ) link_document_version_signature_download = Link( - args='resolved_object.pk', condition=is_detached_signature, - permissions=(permission_document_version_signature_download,), - permissions_related='document_version.document', text=_('Download'), - view='signatures:document_version_signature_download', + condition=is_detached_signature, + kwargs={'signature_id': 'resolved_object.pk'}, + permission=permission_document_version_signature_download, + text=_('Download'), view='signatures:document_version_signature_download' ) link_document_version_signature_upload = Link( - args='resolved_object.pk', - permissions=(permission_document_version_signature_upload,), - permissions_related='document', text=_('Upload signature'), - view='signatures:document_version_signature_upload', + icon_class=icon_document_version_signature_upload, + kwargs={'document_version_id': 'resolved_object.pk'}, + permission=permission_document_version_signature_upload, + text=_('Upload signature'), + view='signatures:document_version_signature_upload' ) link_document_version_signature_detached_create = Link( - args='resolved_object.pk', icon_class=link_document_version_signature_detached_create, - permissions=(permission_document_version_sign_detached,), - permissions_related='document', text=_('Sign detached'), - view='signatures:document_version_signature_detached_create', + kwargs={'document_version_id': 'resolved_object.pk'}, + permission=permission_document_version_sign_detached, + text=_('Sign detached'), + view='signatures:document_version_signature_detached_create' ) link_document_version_signature_embedded_create = Link( - args='resolved_object.pk', icon_class=icon_document_version_signature_embedded_create, - permissions=(permission_document_version_sign_embedded,), - permissions_related='document', text=_('Sign embedded'), - view='signatures:document_version_signature_embedded_create', + kwargs={'document_version_id': 'resolved_object.pk'}, + permission=permission_document_version_sign_embedded, + text=_('Sign embedded'), + view='signatures:document_version_signature_embedded_create' ) diff --git a/mayan/apps/document_states/links.py b/mayan/apps/document_states/links.py index c80fa8c2e4..e51ccc6d5f 100644 --- a/mayan/apps/document_states/links.py +++ b/mayan/apps/document_states/links.py @@ -25,45 +25,42 @@ from .permissions import ( link_document_workflow_instance_list = Link( icon_class=icon_document_workflow_instance_list, kwargs={'document_id': 'resolved_object.pk'}, - permissions=(permission_workflow_view,), text=_('Workflows'), + permission=permission_workflow_view, text=_('Workflows'), view='workflows:document_workflow_instance_list' ) link_tool_launch_all_workflows = Link( icon_class=icon_tool_launch_all_workflows, - permissions=(permission_workflow_tools,), - text=_('Launch all workflows'), + permission=permission_workflow_tools, text=_('Launch all workflows'), view='workflows:tool_launch_all_workflows' ) link_workflow_create = Link( - icon_class=icon_workflow_create, permissions=(permission_workflow_create,), + icon_class=icon_workflow_create, permission=permission_workflow_create, text=_('Create workflow'), view='workflows:workflow_create' ) link_workflow_delete = Link( icon_class=icon_workflow_delete, kwargs={'workflow_id': 'resolved_object.pk'}, - permissions=(permission_workflow_delete,), tags='dangerous', - text=_('Delete'), view='workflows:workflow_delete' + permission=permission_workflow_delete, tags='dangerous', text=_('Delete'), + view='workflows:workflow_delete' ) link_workflow_document_types = Link( icon_class=icon_document_type, kwargs={'workflow_id': 'resolved_object.pk'}, - permissions=(permission_workflow_edit,), text=_('Document types'), + permission=permission_workflow_edit, text=_('Document types'), view='workflows:workflow_document_types' ) link_workflow_edit = Link( - icon_class=icon_workflow_edit, - kwargs={'workflow_id': 'resolved_object.pk'}, - permissions=(permission_workflow_edit,), text=_('Edit'), + icon_class=icon_workflow_edit, kwargs={'workflow_id': 'resolved_object.pk'}, + permission=permission_workflow_edit, text=_('Edit'), view='workflows:workflow_edit' ) link_workflow_list = Link( - icon_class=icon_workflow_list, - permissions=(permission_workflow_view,), text=_('Workflows'), - view='workflows:workflow_list' + icon_class=icon_workflow_list, permission=permission_workflow_view, + text=_('Workflows'), view='workflows:workflow_list' ) link_workflow_preview = Link( icon_class=icon_workflow_preview, kwargs={'workflow_id': 'resolved_object.pk'}, - permissions=(permission_workflow_view,), text=_('Preview'), + permission=permission_workflow_view, text=_('Preview'), view='workflows:workflow_preview' ) @@ -71,7 +68,7 @@ link_workflow_preview = Link( link_workflow_instance_detail = Link( kwargs={'workflow_instance_id': 'resolved_object.pk'}, - permissions=(permission_workflow_view,), text=_('Detail'), + permission=permission_workflow_view, text=_('Detail'), view='workflows:workflow_instance_detail' ) link_workflow_instance_transition = Link( @@ -84,25 +81,25 @@ link_workflow_instance_transition = Link( link_workflow_state_action_delete = Link( icon_class=icon_workflow_state_action_delete, kwargs={'workflow_state_action_id': 'resolved_object.pk'}, - permissions=(permission_workflow_edit,), tags='dangerous', + permission=permission_workflow_edit, tags='dangerous', text=_('Delete'), view='workflows:workflow_state_action_delete' ) link_workflow_state_action_edit = Link( icon_class=icon_workflow_state_action_edit, kwargs={'workflow_state_action_id': 'resolved_object.pk'}, - permissions=(permission_workflow_edit,), text=_('Edit'), + permission=permission_workflow_edit, text=_('Edit'), view='workflows:workflow_state_action_edit' ) link_workflow_state_action_list = Link( icon_class=icon_workflow_state_action_list, kwargs={'workflow_state_id': 'resolved_object.pk'}, - permissions=(permission_workflow_edit,), text=_('Actions'), + permission=permission_workflow_edit, text=_('Actions'), view='workflows:workflow_state_action_list' ) link_workflow_state_action_selection = Link( icon_class=icon_workflow_state_action_selection, kwargs={'workflow_state_id': 'resolved_object.pk'}, - permissions=(permission_workflow_edit,), text=_('Create action'), + permission=permission_workflow_edit, text=_('Create action'), view='workflows:workflow_state_action_selection' ) @@ -111,25 +108,25 @@ link_workflow_state_action_selection = Link( link_workflow_state_create = Link( icon_class=icon_workflow_state_create, kwargs={'workflow_id': 'resolved_object.pk'}, - permissions=(permission_workflow_edit,), text=_('Create state'), + permission=permission_workflow_edit, text=_('Create state'), view='workflows:workflow_state_create' ) link_workflow_state_delete = Link( icon_class=icon_workflow_state_delete, kwargs={'workflow_state_id': 'object.pk'}, - permissions=(permission_workflow_edit,), tags='dangerous', text=_('Delete'), + permission=permission_workflow_edit, tags='dangerous', text=_('Delete'), view='workflows:workflow_state_delete' ) link_workflow_state_edit = Link( icon_class=icon_workflow_state_edit, kwargs={'workflow_state_id': 'resolved_object.pk'}, - permissions=(permission_workflow_edit,), text=_('Edit'), + permission=permission_workflow_edit, text=_('Edit'), view='workflows:workflow_state_edit' ) link_workflow_state_list = Link( icon_class=icon_workflow_state, kwargs={'workflow_id': 'resolved_object.pk'}, - permissions=(permission_workflow_view,), text=_('States'), + permission=permission_workflow_view, text=_('States'), view='workflows:workflow_state_list' ) @@ -138,30 +135,30 @@ link_workflow_state_list = Link( link_workflow_transition_create = Link( icon_class=icon_workflow_transition_create, kwargs={'workflow_id': 'resolved_object.pk'}, - permissions=(permission_workflow_edit,), text=_('Create transition'), + permission=permission_workflow_edit, text=_('Create transition'), view='workflows:workflow_transition_create' ) link_workflow_transition_delete = Link( icon_class=icon_workflow_transition_delete, kwargs={'workflow_transition_id': 'resolved_object.pk'}, - permissions=(permission_workflow_edit,), tags='dangerous', text=_('Delete'), + permission=permission_workflow_edit, tags='dangerous', text=_('Delete'), view='workflows:workflow_transition_delete' ) link_workflow_transition_edit = Link( icon_class=icon_workflow_transition_edit, kwargs={'workflow_transition_id': 'resolved_object.pk'}, - permissions=(permission_workflow_edit,), text=_('Edit'), + permission=permission_workflow_edit, text=_('Edit'), view='workflows:workflow_transition_edit' ) link_workflow_transition_list = Link( icon_class=icon_workflow_transition, kwargs={'workflow_transition_id': 'resolved_object.pk'}, - permissions=(permission_workflow_view,), text=_('Transitions'), + permission=permission_workflow_view, text=_('Transitions'), view='workflows:workflow_transition_list' ) link_workflow_transition_triggers = Link( kwargs={'workflow_transition_id': 'resolved_object.pk'}, - permissions=(permission_workflow_edit,), text=_('Transition triggers'), + permission=permission_workflow_edit, text=_('Transition triggers'), view='workflows:workflow_transition_triggers' ) @@ -169,20 +166,20 @@ link_workflow_transition_triggers = Link( link_workflow_runtime_proxy_document_list = Link( kwargs={'workflow_runtime_proxy_id': 'resolved_object.pk'}, - permissions=(permission_workflow_view,), text=_('Workflow documents'), + permission=permission_workflow_view, text=_('Workflow documents'), view='workflows:workflow_runtime_proxy_document_list' ) link_workflow_runtime_proxy_list = Link( - icon_class=icon_workflow_list, permissions=(permission_workflow_view,), + icon_class=icon_workflow_list, permission=permission_workflow_view, text=_('Workflows'), view='workflows:workflow_runtime_proxy_list' ) link_workflow_runtime_proxy_state_document_list = Link( kwargs={'workflow_runtime_proxy_state_id': 'resolved_object.pk'}, - permissions=(permission_workflow_view,), text=_('State documents'), + permission=permission_workflow_view, text=_('State documents'), view='workflows:workflow_runtime_proxy_state_document_list' ) link_workflow_runtime_proxy_state_list = Link( kwargs={'workflow_runtime_proxy_id': 'resolved_object.pk'}, - permissions=(permission_workflow_view,), text=_('States'), + permission=permission_workflow_view, text=_('States'), view='workflows:workflow_runtime_proxy_state_list' ) diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py index e8388d5212..8478b5b6c5 100644 --- a/mayan/apps/documents/links.py +++ b/mayan/apps/documents/links.py @@ -14,7 +14,7 @@ from .icons import ( icon_document_delete, icon_document_download, icon_document_edit, icon_document_favorites_add, icon_document_favorites_remove, icon_document_multiple_delete, - icon_document_multiepl_restore, icon_document_page_navigation_first, + icon_document_multiple_restore, icon_document_page_navigation_first, icon_document_page_navigation_last, icon_document_page_navigation_next, icon_document_page_navigation_previous, icon_document_page_return, icon_document_page_rotate_left, @@ -75,93 +75,92 @@ def is_min_zoom(context): # Facet link_document_preview = Link( args='resolved_object.id', icon_class=icon_document_preview, - permissions=(permission_document_view,), - text=_('Preview'), view='documents:document_preview', + permission=permission_document_view, text=_('Preview'), + view='documents:document_preview' ) link_document_properties = Link( args='resolved_object.id', icon_class=icon_document_properties, - permissions=(permission_document_view,), - text=_('Properties'), view='documents:document_properties', + permission=permission_document_view, text=_('Properties'), + view='documents:document_properties' ) link_document_version_list = Link( args='resolved_object.pk', icon_class=icon_document_version_list, - permissions=(permission_document_version_view,), - text=_('Versions'), view='documents:document_version_list', + permission=permission_document_version_view, text=_('Versions'), + view='documents:document_version_list' ) link_document_pages = Link( args='resolved_object.pk', icon_class=icon_document_pages, - permissions=(permission_document_view,), text=_('Pages'), - view='documents:document_pages', + permission=permission_document_view, text=_('Pages'), + view='documents:document_pages' ) # Actions link_document_clear_transformations = Link( - args='resolved_object.id', - permissions=(permission_transformation_delete,), + args='resolved_object.id', permission=permission_transformation_delete, text=_('Clear transformations'), - view='documents:document_clear_transformations', + view='documents:document_clear_transformations' ) link_document_clone_transformations = Link( - args='resolved_object.id', permissions=(permission_transformation_edit,), + args='resolved_object.id', permission=permission_transformation_edit, text=_('Clone transformations'), - view='documents:document_clone_transformations', + view='documents:document_clone_transformations' ) link_document_delete = Link( args='resolved_object.id', icon_class=icon_document_delete, - permissions=(permission_document_delete,), tags='dangerous', - text=_('Delete'), view='documents:document_delete', + permission=permission_document_delete, tags='dangerous', + text=_('Delete'), view='documents:document_delete' ) link_document_favorites_add = Link( args='resolved_object.id', icon_class=icon_document_favorites_add, - permissions=(permission_document_view,), text=_('Add to favorites'), - view='documents:document_add_to_favorites', + permission=permission_document_view, text=_('Add to favorites'), + view='documents:document_add_to_favorites' ) link_document_favorites_remove = Link( args='resolved_object.id', icon_class=icon_document_favorites_remove, - permissions=(permission_document_view,), text=_('Remove from favorites'), - view='documents:document_remove_from_favorites', + permission=permission_document_view, text=_('Remove from favorites'), + view='documents:document_remove_from_favorites' ) link_document_trash = Link( args='resolved_object.id', icon_class=icon_document_trash, - permissions=(permission_document_trash,), tags='dangerous', - text=_('Move to trash'), view='documents:document_trash', + permission=permission_document_trash, tags='dangerous', + text=_('Move to trash'), view='documents:document_trash' ) link_document_edit = Link( args='resolved_object.id', icon_class=icon_document_edit, - permissions=(permission_document_properties_edit,), - text=_('Edit properties'), view='documents:document_edit', + permission=permission_document_properties_edit, + text=_('Edit properties'), view='documents:document_edit' ) link_document_document_type_edit = Link( args='resolved_object.id', - permissions=(permission_document_properties_edit,), text=_('Change type'), - view='documents:document_document_type_edit', + permission=permission_document_properties_edit, text=_('Change type'), + view='documents:document_document_type_edit' ) link_document_download = Link( args='resolved_object.id', icon_class=icon_document_download, - permissions=(permission_document_download,), text=_('Advanced download'), - view='documents:document_download_form', + permission=permission_document_download, text=_('Advanced download'), + view='documents:document_download_form' ) link_document_print = Link( args='resolved_object.id', icon_class=icon_document_print, - permissions=(permission_document_print,), - text=_('Print'), view='documents:document_print', + permission=permission_document_print, text=_('Print'), + view='documents:document_print' ) link_document_quick_download = Link( - args='resolved_object.id', permissions=(permission_document_download,), - text=_('Quick download'), view='documents:document_download', + args='resolved_object.id', permission=permission_document_download, + text=_('Quick download'), view='documents:document_download' ) link_document_update_page_count = Link( - args='resolved_object.pk', permissions=(permission_document_tools,), + args='resolved_object.pk', permission=permission_document_tools, text=_('Recalculate page count'), view='documents:document_update_page_count' ) link_document_restore = Link( - icon_class=icon_document_restore, - permissions=(permission_document_restore,), text=_('Restore'), - view='documents:document_restore', args='object.pk' + args='object.pk', icon_class=icon_document_restore, + permission=permission_document_restore, text=_('Restore'), + view='documents:document_restore' ) link_document_multiple_clear_transformations = Link( - permissions=(permission_transformation_delete,), + permission=permission_transformation_delete, text=_('Clear transformations'), view='documents:document_multiple_clear_transformations' ) @@ -175,49 +174,50 @@ link_document_multiple_delete = Link( ) link_document_multiple_favorites_add = Link( text=_('Add to favorites'), - view='documents:document_multiple_add_to_favorites', + view='documents:document_multiple_add_to_favorites' ) link_document_multiple_favorites_remove = Link( text=_('Remove from favorites'), - view='documents:document_multiple_remove_from_favorites', + view='documents:document_multiple_remove_from_favorites' ) link_document_multiple_document_type_edit = Link( text=_('Change type'), view='documents:document_multiple_document_type_edit' ) link_document_multiple_download = Link( - text=_('Advanced download'), view='documents:document_multiple_download_form' + text=_('Advanced download'), + view='documents:document_multiple_download_form' ) link_document_multiple_update_page_count = Link( text=_('Recalculate page count'), view='documents:document_multiple_update_page_count' ) link_document_multiple_restore = Link( - icon_class=icon_document_multiepl_restore, text=_('Restore'), + icon_class=icon_document_multiple_restore, text=_('Restore'), view='documents:document_multiple_restore' ) # Versions link_document_version_download = Link( args='resolved_object.pk', icon_class=icon_document_version_download, - permissions=(permission_document_download,), - text=_('Download version'), view='documents:document_version_download_form' + permission=permission_document_download, text=_('Download version'), + view='documents:document_version_download_form' ) link_document_version_return_document = Link( args='resolved_object.document.pk', icon_class=icon_document_version_return_document, - permissions=(permission_document_view,), text=_('Document'), - view='documents:document_preview', + permission=permission_document_view, text=_('Document'), + view='documents:document_preview' ) link_document_version_return_list = Link( args='resolved_object.document.pk', icon_class=icon_document_version_return_list, - permissions=(permission_document_version_view,), text=_('Versions'), - view='documents:document_version_list', + permission=permission_document_version_view, text=_('Versions'), + view='documents:document_version_list' ) link_document_version_view = Link( args='resolved_object.pk', icon_class=icon_document_version_view, - permissions=(permission_document_version_view,), text=_('Preview'), + permission=permission_document_version_view, text=_('Preview'), view='documents:document_version_view' ) @@ -249,12 +249,12 @@ link_clear_image_cache = Link( description=_( 'Clear the graphics representations used to speed up the documents\' ' 'display and interactive transformations results.' - ), permissions=(permission_document_tools,), + ), permission=permission_document_tools, text=_('Clear document image cache'), view='documents:document_clear_image_cache' ) link_trash_can_empty = Link( - icon_class=icon_trash_can_empty, permissions=(permission_empty_trash,), + icon_class=icon_trash_can_empty, permission=permission_empty_trash, text=_('Empty trash'), view='documents:trash_can_empty' ) @@ -262,119 +262,119 @@ link_trash_can_empty = Link( link_document_page_navigation_first = Link( args='resolved_object.pk', conditional_disable=is_first_page, icon_class=icon_document_page_navigation_first, - keep_query=True, permissions=(permission_document_view,), - text=_('First page'), view='documents:document_page_navigation_first', + keep_query=True, permission=permission_document_view, + text=_('First page'), view='documents:document_page_navigation_first' ) link_document_page_navigation_last = Link( args='resolved_object.pk', conditional_disable=is_last_page, icon_class=icon_document_page_navigation_last, keep_query=True, text=_('Last page'), - permissions=(permission_document_view,), - view='documents:document_page_navigation_last', + permission=permission_document_view, + view='documents:document_page_navigation_last' ) link_document_page_navigation_previous = Link( args='resolved_object.pk', conditional_disable=is_first_page, icon_class=icon_document_page_navigation_previous, - keep_query=True, permissions=(permission_document_view,), + keep_query=True, permission=permission_document_view, text=_('Previous page'), - view='documents:document_page_navigation_previous', + view='documents:document_page_navigation_previous' ) link_document_page_navigation_next = Link( args='resolved_object.pk', conditional_disable=is_last_page, icon_class=icon_document_page_navigation_next, keep_query=True, text=_('Next page'), - permissions=(permission_document_view,), - view='documents:document_page_navigation_next', + permission=permission_document_view, + view='documents:document_page_navigation_next' ) link_document_page_return = Link( args='resolved_object.document.pk', icon_class=icon_document_page_return, - permissions=(permission_document_view,), text=_('Document'), - view='documents:document_preview', + permission=permission_document_view, text=_('Document'), + view='documents:document_preview' ) link_document_page_rotate_left = Link( args='resolved_object.pk', icon_class=icon_document_page_rotate_left, - keep_query=True, permissions=(permission_document_view,), - text=_('Rotate left'), view='documents:document_page_rotate_left', + keep_query=True, permission=permission_document_view, + text=_('Rotate left'), view='documents:document_page_rotate_left' ) link_document_page_rotate_right = Link( args='resolved_object.pk', icon_class=icon_document_page_rotate_right, - keep_query=True, permissions=(permission_document_view,), - text=_('Rotate right'), view='documents:document_page_rotate_right', + keep_query=True, permission=permission_document_view, + text=_('Rotate right'), view='documents:document_page_rotate_right' ) link_document_page_view = Link( icon_class=icon_document_page_view, - permissions=(permission_document_view,), text=_('Page image'), + permission=permission_document_view, text=_('Page image'), view='documents:document_page_view', args='resolved_object.pk' ) link_document_page_view_reset = Link( icon_class=icon_document_page_view_reset, - permissions=(permission_document_view,), text=_('Reset view'), + permission=permission_document_view, text=_('Reset view'), view='documents:document_page_view_reset', args='resolved_object.pk' ) link_document_page_zoom_in = Link( args='resolved_object.pk', conditional_disable=is_max_zoom, icon_class=icon_document_page_zoom_in, keep_query=True, - permissions=(permission_document_view,), text=_('Zoom in'), - view='documents:document_page_zoom_in', + permission=permission_document_view, text=_('Zoom in'), + view='documents:document_page_zoom_in' ) link_document_page_zoom_out = Link( args='resolved_object.pk', conditional_disable=is_min_zoom, icon_class=icon_document_page_zoom_out, keep_query=True, - permissions=(permission_document_view,), text=_('Zoom out'), - view='documents:document_page_zoom_out', + permission=permission_document_view, text=_('Zoom out'), + view='documents:document_page_zoom_out' ) # Document versions link_document_version_revert = Link( args='object.pk', condition=is_not_current_version, - permissions=(permission_document_version_revert,), tags='dangerous', - text=_('Revert'), view='documents:document_version_revert', + permission=permission_document_version_revert, tags='dangerous', + text=_('Revert'), view='documents:document_version_revert' ) # Document type related links link_document_type_create = Link( icon_class=icon_document_type_create, - permissions=(permission_document_type_create,), + permission=permission_document_type_create, text=_('Create document type'), view='documents:document_type_create' ) link_document_type_delete = Link( args='resolved_object.id', icon_class=icon_document_type_delete, - permissions=(permission_document_type_delete,), tags='dangerous', - text=_('Delete'), view='documents:document_type_delete', + permission=permission_document_type_delete, tags='dangerous', + text=_('Delete'), view='documents:document_type_delete' ) link_document_type_edit = Link( args='resolved_object.id', icon_class=icon_document_type_edit, - permissions=(permission_document_type_edit,), text=_('Edit'), - view='documents:document_type_edit', + permission=permission_document_type_edit, text=_('Edit'), + view='documents:document_type_edit' ) link_document_type_filename_create = Link( args='document_type.id', icon_class=icon_document_type_filename_create, - permissions=(permission_document_type_edit,), + permission=permission_document_type_edit, text=_('Add quick label to document type'), - view='documents:document_type_filename_create', + view='documents:document_type_filename_create' ) link_document_type_filename_delete = Link( - args='resolved_object.id', permissions=(permission_document_type_edit,), + args='resolved_object.id', permission=permission_document_type_edit, tags='dangerous', text=_('Delete'), - view='documents:document_type_filename_delete', + view='documents:document_type_filename_delete' ) link_document_type_filename_edit = Link( - args='resolved_object.id', permissions=(permission_document_type_edit,), - text=_('Edit'), view='documents:document_type_filename_edit', + args='resolved_object.id', permission=permission_document_type_edit, + text=_('Edit'), view='documents:document_type_filename_edit' ) link_document_type_filename_list = Link( args='resolved_object.id', icon_class=icon_document_type_filename, - permissions=(permission_document_type_view,), text=_('Quick labels'), - view='documents:document_type_filename_list', + permission=permission_document_type_view, text=_('Quick labels'), + view='documents:document_type_filename_list' ) link_document_type_list = Link( icon_class=icon_document_type_list, - permissions=(permission_document_type_view,), text=_('Document types'), + permission=permission_document_type_view, text=_('Document types'), view='documents:document_type_list' ) link_document_type_setup = Link( icon_class=icon_document_type_setup, - permissions=(permission_document_type_view,), text=_('Document types'), + permission=permission_document_type_view, text=_('Document types'), view='documents:document_type_list' ) link_duplicated_document_list = Link( @@ -383,12 +383,11 @@ link_duplicated_document_list = Link( ) link_document_duplicates_list = Link( args='resolved_object.id', icon_class=icon_document_duplicates_list, - permissions=(permission_document_view,), text=_('Duplicates'), - view='documents:document_duplicates_list', + permission=permission_document_view, text=_('Duplicates'), + view='documents:document_duplicates_list' ) link_duplicated_document_scan = Link( icon_class=icon_duplicated_document_scan, - permissions=(permission_document_tools,), - text=_('Duplicated document scan'), + permission=permission_document_tools, text=_('Duplicated document scan'), view='documents:duplicated_document_scan' ) diff --git a/mayan/apps/events/links.py b/mayan/apps/events/links.py index 0a2b8c6fd5..e020df2af8 100644 --- a/mayan/apps/events/links.py +++ b/mayan/apps/events/links.py @@ -41,11 +41,11 @@ link_events_details = Link( link_events_for_object = Link( icon_class=icon_events_for_object, kwargs=get_kwargs_factory('resolved_object'), - permissions=(permission_events_view,), text=_('Events'), + permission=permission_events_view, text=_('Events'), view='events:events_for_object', ) link_events_list = Link( - icon_class=icon_events_list, permissions=(permission_events_view,), + icon_class=icon_events_list, permission=permission_events_view, text=_('Events'), view='events:events_list' ) link_event_types_subscriptions_list = Link( @@ -63,7 +63,7 @@ link_notification_mark_read_all = Link( link_object_event_types_user_subcriptions_list = Link( icon_class=icon_object_event_types_user_subcriptions_list, kwargs=get_kwargs_factory('resolved_object'), - permissions=(permission_events_view,), text=_('Subscriptions'), + permission=permission_events_view, text=_('Subscriptions'), view='events:object_event_types_user_subcriptions_list', ) link_user_notifications_list = Link( diff --git a/mayan/apps/file_metadata/links.py b/mayan/apps/file_metadata/links.py index ef884470c7..99f827ef39 100644 --- a/mayan/apps/file_metadata/links.py +++ b/mayan/apps/file_metadata/links.py @@ -15,19 +15,19 @@ from .permissions import ( link_document_driver_list = Link( icon_class=icon_file_metadata, kwargs={'document_id': 'resolved_object.id'}, - permissions=(permission_file_metadata_view,), text=_('File metadata'), - view='file_metadata:document_driver_list', + permission=permission_file_metadata_view, text=_('File metadata'), + view='file_metadata:document_driver_list' ) link_document_file_metadata_list = Link( icon_class=icon_file_metadata, kwargs={'document_version_driver_id': 'resolved_object.id'}, - permissions=(permission_file_metadata_view,), text=_('Attributes'), - view='file_metadata:document_version_driver_file_metadata_list', + permission=permission_file_metadata_view, text=_('Attributes'), + view='file_metadata:document_version_driver_file_metadata_list' ) link_document_submit = Link( icon_class=icon_document_submit, kwargs={'document_id': 'resolved_object.id'}, - permissions=(permission_file_metadata_submit,), + permission=permission_file_metadata_submit, text=_('Submit for file metadata'), view='file_metadata:document_submit' ) link_document_multiple_submit = Link( @@ -37,13 +37,11 @@ link_document_multiple_submit = Link( link_document_type_file_metadata_settings = Link( icon_class=icon_file_metadata, kwargs={'document_type_id': 'resolved_object.id'}, - permissions=(permission_document_type_file_metadata_setup,), - text=_('Setup file metadata'), - view='file_metadata:document_type_settings', + permission=permission_document_type_file_metadata_setup, + text=_('Setup file metadata'), view='file_metadata:document_type_settings' ) link_document_type_submit = Link( - icon_class=icon_file_metadata, - permissions=(permission_file_metadata_submit,), + icon_class=icon_file_metadata, permission=permission_file_metadata_submit, text=_('File metadata processing per type'), view='file_metadata:document_type_submit' ) diff --git a/mayan/apps/linking/links.py b/mayan/apps/linking/links.py index 911a6c47df..c81392917c 100644 --- a/mayan/apps/linking/links.py +++ b/mayan/apps/linking/links.py @@ -19,61 +19,59 @@ from .permissions import ( link_smart_link_condition_create = Link( icon_class=icon_smart_link_condition_create, kwargs={'smart_link_id': 'object.pk'}, - permissions=(permission_smart_link_edit,), text=_('Create condition'), + permission=permission_smart_link_edit, text=_('Create condition'), view='linking:smart_link_condition_create' ) link_smart_link_condition_delete = Link( kwargs={'smart_link_condition_id': 'resolved_object.pk'}, - permissions=(permission_smart_link_edit,), tags='dangerous', + permission=permission_smart_link_edit, tags='dangerous', text=_('Delete'), view='linking:smart_link_condition_delete' ) link_smart_link_condition_edit = Link( kwargs={'smart_link_condition_id': 'resolved_object.pk'}, - permissions=(permission_smart_link_edit,), text=_('Edit'), + permission=permission_smart_link_edit, text=_('Edit'), view='linking:smart_link_condition_edit' ) link_smart_link_condition_list = Link( icon_class=icon_smart_link_condition, kwargs={'smart_link_id': 'object.pk'}, - permissions=(permission_smart_link_edit,), text=_('Conditions'), + permission=permission_smart_link_edit, text=_('Conditions'), view='linking:smart_link_condition_list' ) link_smart_link_create = Link( - icon_class=icon_smart_link_create, - permissions=(permission_smart_link_create,), + icon_class=icon_smart_link_create, permission=permission_smart_link_create, text=_('Create new smart link'), view='linking:smart_link_create' ) link_smart_link_delete = Link( kwargs={'smart_link_id': 'object.pk'}, - permissions=(permission_smart_link_delete,), - tags='dangerous', text=_('Delete'), view='linking:smart_link_delete' + permission=permission_smart_link_delete, tags='dangerous', + text=_('Delete'), view='linking:smart_link_delete' ) link_smart_link_document_types = Link( icon_class=icon_document_type, kwargs={'document_type_id': 'object.pk'}, - permissions=(permission_smart_link_edit,), text=_('Document types'), - view='linking:smart_link_document_types', + permission=permission_smart_link_edit, text=_('Document types'), + view='linking:smart_link_document_types' ) link_smart_link_edit = Link( kwargs={'smart_link_id': 'object.pk'}, - permissions=(permission_smart_link_edit,), - text=_('Edit'), view='linking:smart_link_edit', + permission=permission_smart_link_edit, text=_('Edit'), + view='linking:smart_link_edit' ) link_smart_link_instance_view = Link( kwargs={'document_id': 'document.pk', 'smart_link_id': 'object.pk'}, - permissions=(permission_smart_link_view,), text=_('Documents'), + permission=permission_smart_link_view, text=_('Documents'), view='linking:resolved_smart_link_details' ) link_smart_link_instances_for_document = Link( icon_class=icon_smart_link_instances_for_document, kwargs={'document_id': 'resolved_object.pk'}, - permissions=(permission_document_view,), text=_('Smart links'), - view='linking:resolved_smart_links_for_document', + permission=permission_document_view, text=_('Smart links'), + view='linking:resolved_smart_links_for_document' ) link_smart_link_list = Link( - permissions=(permission_smart_link_view,), text=_('Smart links'), + permission=permission_smart_link_view, text=_('Smart links'), view='linking:smart_link_list' ) link_smart_link_setup = Link( - icon_class=icon_smart_link_setup, - permissions=(permission_smart_link_view,), text=_('Smart links'), - view='linking:smart_link_list' + icon_class=icon_smart_link_setup, permission=permission_smart_link_view, + text=_('Smart links'), view='linking:smart_link_list' ) diff --git a/mayan/apps/mailer/links.py b/mayan/apps/mailer/links.py index aa25965cfc..e9acd5831f 100644 --- a/mayan/apps/mailer/links.py +++ b/mayan/apps/mailer/links.py @@ -19,12 +19,12 @@ from .permissions import ( link_document_send = Link( args='resolved_object.pk', icon_class=icon_document_send, - permissions=(permission_mailing_send_document,), text=_('Email document'), + permission=permission_mailing_send_document, text=_('Email document'), view='mailer:document_send' ) link_document_send_link = Link( args='resolved_object.pk', icon_class=icon_document_send_link, - permissions=(permission_mailing_link,), text=_('Email link'), + permission=permission_mailing_link, text=_('Email link'), view='mailer:document_send_link' ) link_document_multiple_send = Link( @@ -37,40 +37,40 @@ link_document_multiple_send_link = Link( ) link_system_mailer_error_log = Link( icon_class=icon_system_mailer_error_log, - permissions=(permission_view_error_log,), - text=_('System mailer error log'), view='mailer:system_mailer_error_log', + permission=permission_view_error_log, + text=_('System mailer error log'), view='mailer:system_mailer_error_log' ) link_user_mailer_create = Link( icon_class=icon_user_mailer_create, - permissions=(permission_user_mailer_create,), - text=_('User mailer create'), view='mailer:user_mailer_backend_selection', + permission=permission_user_mailer_create, text=_('User mailer create'), + view='mailer:user_mailer_backend_selection' ) link_user_mailer_delete = Link( args='resolved_object.pk', icon_class=icon_user_mailer_delete, - permissions=(permission_user_mailer_delete,), tags='dangerous', - text=_('Delete'), view='mailer:user_mailer_delete', + permission=permission_user_mailer_delete, tags='dangerous', + text=_('Delete'), view='mailer:user_mailer_delete' ) link_user_mailer_edit = Link( args='object.pk', icon_class=icon_user_mailer_edit, - permissions=(permission_user_mailer_edit,), text=_('Edit'), - view='mailer:user_mailer_edit', + permission=permission_user_mailer_edit, text=_('Edit'), + view='mailer:user_mailer_edit' ) link_user_mailer_log_list = Link( - args='object.pk', permissions=(permission_user_mailer_view,), - text=_('Log'), view='mailer:user_mailer_log', + args='object.pk', permission=permission_user_mailer_view, + text=_('Log'), view='mailer:user_mailer_log' ) link_user_mailer_list = Link( icon_class=icon_user_mailer_list, - permissions=(permission_user_mailer_view,), - text=_('Mailing profiles list'), view='mailer:user_mailer_list', + permission=permission_user_mailer_view, + text=_('Mailing profiles list'), view='mailer:user_mailer_list' ) link_user_mailer_setup = Link( icon_class=icon_user_mailer_setup, - permissions=(permission_user_mailer_view,), - text=_('Mailing profiles'), view='mailer:user_mailer_list', + permission=permission_user_mailer_view, + text=_('Mailing profiles'), view='mailer:user_mailer_list' ) link_user_mailer_test = Link( args='object.pk', icon_class=icon_user_mailer_test, - permissions=(permission_user_mailer_use,), text=_('Test'), - view='mailer:user_mailer_test', + permission=permission_user_mailer_use, text=_('Test'), + view='mailer:user_mailer_test' ) diff --git a/mayan/apps/mayan_statistics/links.py b/mayan/apps/mayan_statistics/links.py index 76a7e70e56..c06983e786 100644 --- a/mayan/apps/mayan_statistics/links.py +++ b/mayan/apps/mayan_statistics/links.py @@ -9,22 +9,22 @@ from .permissions import permission_statistics_view # Translators: 'Queue' here is the verb, to queue a statistic to update link_execute = Link( - permissions=(permission_statistics_view,), text=_('Queue'), + permission=permission_statistics_view, text=_('Queue'), view='statistics:statistic_queue', args='resolved_object.slug' ) link_view = Link( - permissions=(permission_statistics_view,), text=_('View'), + permission=permission_statistics_view, text=_('View'), view='statistics:statistic_detail', args='resolved_object.slug' ) link_namespace_details = Link( - permissions=(permission_statistics_view,), text=_('Namespace details'), + permission=permission_statistics_view, text=_('Namespace details'), view='statistics:namespace_details', args='resolved_object.slug' ) link_namespace_list = Link( - permissions=(permission_statistics_view,), text=_('Namespace list'), + permission=permission_statistics_view, text=_('Namespace list'), view='statistics:namespace_list' ) link_statistics = Link( - icon_class=icon_statistics, permissions=(permission_statistics_view,), + icon_class=icon_statistics, permission=permission_statistics_view, text=_('Statistics'), view='statistics:namespace_list' ) diff --git a/mayan/apps/metadata/links.py b/mayan/apps/metadata/links.py index 75869e0525..b2b187578e 100644 --- a/mayan/apps/metadata/links.py +++ b/mayan/apps/metadata/links.py @@ -23,25 +23,25 @@ from .permissions import ( link_document_metadata_add = Link( icon_class=icon_document_metadata_add, kwargs={'document_id': 'object.pk'}, - permissions=(permission_document_metadata_add,), text=_('Add metadata'), + permission=permission_document_metadata_add, text=_('Add metadata'), view='metadata:document_metadata_add', ) link_document_metadata_edit = Link( icon_class=icon_document_metadata_edit, kwargs={'document_id': 'object.pk'}, - permissions=(permission_document_metadata_edit,), text=_('Edit metadata'), + permission=permission_document_metadata_edit, text=_('Edit metadata'), view='metadata:document_metadata_edit' ) link_document_metadata_remove = Link( icon_class=icon_document_metadata_remove, kwargs={'document_id': 'object.pk'}, - permissions=(permission_document_metadata_remove,), - text=_('Remove metadata'), view='metadata:document_metadata_remove', + permission=permission_document_metadata_remove, + text=_('Remove metadata'), view='metadata:document_metadata_remove' ) link_document_metadata_view = Link( icon_class=icon_document_metadata_view, kwargs={'document_id': 'resolved_object.pk'}, - permissions=(permission_document_metadata_view,), text=_('Metadata'), - view='metadata:document_metadata_view', + permission=permission_document_metadata_view, text=_('Metadata'), + view='metadata:document_metadata_view' ) link_document_multiple_metadata_add = Link( icon_class=icon_document_multiple_metadata_add, text=_('Add metadata'), @@ -59,34 +59,34 @@ link_document_multiple_metadata_remove = Link( link_document_type_metadata_types = Link( icon_class=icon_document_type_metadata_types, kwargs={'document_type_id': 'resolved_object.pk'}, - permissions=(permission_document_type_edit,), text=_('Metadata types'), - view='metadata:document_type_metadata_types', + permission=permission_document_type_edit, text=_('Metadata types'), + view='metadata:document_type_metadata_types' ) link_metadata_type_document_types = Link( icon_class=icon_document_type, kwargs={'metadata_type_id': 'resolved_object.pk'}, - permissions=(permission_document_type_edit,), text=_('Document types'), - view='metadata:metadata_type_document_types', + permission=permission_document_type_edit, text=_('Document types'), + view='metadata:metadata_type_document_types' ) link_metadata_type_create = Link( icon_class=icon_metadata_type_create, - permissions=(permission_metadata_type_create,), text=_('Create new'), + permission=permission_metadata_type_create, text=_('Create new'), view='metadata:metadata_type_create' ) link_metadata_type_delete = Link( icon_class=icon_metadata_type_delete, kwargs={'metadata_type_id': 'object.pk'}, - permissions=(permission_metadata_type_delete,), tags='dangerous', - text=_('Delete'), view='metadata:metadata_type_delete', + permission=permission_metadata_type_delete, tags='dangerous', + text=_('Delete'), view='metadata:metadata_type_delete' ) link_metadata_type_edit = Link( icon_class=icon_metadata_type_edit, kwargs={'metadata_type_id': 'object.pk'}, - permissions=(permission_metadata_type_edit,), text=_('Edit'), + permission=permission_metadata_type_edit, text=_('Edit'), view='metadata:metadata_type_edit' ) link_metadata_type_list = Link( icon_class=icon_metadata_type_list, - permissions=(permission_metadata_type_view,), text=_('Metadata types'), + permission=permission_metadata_type_view, text=_('Metadata types'), view='metadata:metadata_type_list' ) diff --git a/mayan/apps/motd/links.py b/mayan/apps/motd/links.py index b5fd4ca109..d29b1547fc 100644 --- a/mayan/apps/motd/links.py +++ b/mayan/apps/motd/links.py @@ -14,17 +14,17 @@ from .permissions import ( ) link_message_create = Link( - icon_class=icon_message_create, permissions=(permission_message_create,), + icon_class=icon_message_create, permission=permission_message_create, text=_('Create message'), view='motd:message_create' ) link_message_delete = Link( icon_class=icon_message_delete, kwargs={'message_id': 'object.pk'}, - permissions=(permission_message_delete,), tags='dangerous', + permission=permission_message_delete, tags='dangerous', text=_('Delete'), view='motd:message_delete' ) link_message_edit = Link( icon_class=icon_message_edit, kwargs={'message_id': 'object.pk'}, - permissions=(permission_message_edit,), text=_('Edit'), + permission=permission_message_edit, text=_('Edit'), view='motd:message_edit' ) link_message_list = Link( diff --git a/mayan/apps/ocr/links.py b/mayan/apps/ocr/links.py index cf67bdaf50..a11ad24899 100644 --- a/mayan/apps/ocr/links.py +++ b/mayan/apps/ocr/links.py @@ -18,19 +18,19 @@ from .permissions import ( link_document_page_ocr_content = Link( icon_class=icon_document_content, kwargs={'document_page_id': 'resolved_object.id'}, - permissions=(permission_ocr_content_view,), text=_('OCR'), - view='ocr:document_page_content', + permission=permission_ocr_content_view, text=_('OCR'), + view='ocr:document_page_content' ) link_document_ocr_content = Link( icon_class=icon_document_content, kwargs={'document_id': 'resolved_object.id'}, - permissions=(permission_ocr_content_view,), text=_('OCR'), - view='ocr:document_content', + permission=permission_ocr_content_view, text=_('OCR'), + view='ocr:document_content' ) link_document_submit = Link( icon_class=icon_document_submit, kwargs={'document_id': 'resolved_object.id'}, - permissions=(permission_ocr_document,), text=_('Submit for OCR'), + permission=permission_ocr_document, text=_('Submit for OCR'), view='ocr:document_submit' ) link_document_multiple_submit = Link( @@ -40,27 +40,27 @@ link_document_multiple_submit = Link( link_document_type_ocr_settings = Link( icon_class=icon_document_type_ocr_settings, kwargs={'document_type_id': 'resolved_object.id'}, - permissions=(permission_document_type_ocr_setup,), text=_('Setup OCR'), - view='ocr:document_type_settings', + permission=permission_document_type_ocr_setup, text=_('Setup OCR'), + view='ocr:document_type_settings' ) link_document_type_submit = Link( icon_class=icon_document_type_submit, - permissions=(permission_ocr_document,), text=_('OCR documents per type'), + permission=permission_ocr_document, text=_('OCR documents per type'), view='ocr:document_type_submit' ) link_entry_list = Link( - icon_class=icon_entry_list, permissions=(permission_ocr_document,), + icon_class=icon_entry_list, permission=permission_ocr_document, text=_('OCR errors'), view='ocr:entry_list' ) link_document_ocr_errors_list = Link( icon_class=icon_document_ocr_errors_list, kwargs={'document_id': 'resolved_object.id'}, - permissions=(permission_ocr_content_view,), text=_('OCR errors'), + permission=permission_ocr_content_view, text=_('OCR errors'), view='ocr:document_error_list' ) link_document_ocr_download = Link( icon_class=icon_document_ocr_download, kwargs={'document_id': 'resolved_object.id'}, - permissions=(permission_ocr_content_view,), text=_('Download OCR text'), + permission=permission_ocr_content_view, text=_('Download OCR text'), view='ocr:document_download' ) diff --git a/mayan/apps/smart_settings/links.py b/mayan/apps/smart_settings/links.py index 67c66e53f3..8068ad2309 100644 --- a/mayan/apps/smart_settings/links.py +++ b/mayan/apps/smart_settings/links.py @@ -8,21 +8,21 @@ from .icons import icon_namespace_list from .permissions import permission_settings_edit, permission_settings_view link_namespace_list = Link( - icon_class=icon_namespace_list, permissions=(permission_settings_view,), + icon_class=icon_namespace_list, permission=permission_settings_view, text=_('Settings'), view='settings:namespace_list' ) link_namespace_detail = Link( kwargs={'namespace_name': 'resolved_object.name'}, - permissions=(permission_settings_view,), text=_('Settings'), + permission=permission_settings_view, text=_('Settings'), view='settings:namespace_detail' ) # Duplicate the link to use a different name link_namespace_root_list = Link( - icon_class=icon_namespace_list, permissions=(permission_settings_view,), + icon_class=icon_namespace_list, permission=permission_settings_view, text=_('Namespaces'), view='settings:namespace_list' ) link_setting_edit = Link( kwargs={'setting_global_name': 'resolved_object.global_name'}, - permissions=(permission_settings_edit,), text=_('Edit'), + permission=permission_settings_edit, text=_('Edit'), view='settings:setting_edit_view' ) diff --git a/mayan/apps/sources/links.py b/mayan/apps/sources/links.py index bf206ec3b4..a35c6ca796 100644 --- a/mayan/apps/sources/links.py +++ b/mayan/apps/sources/links.py @@ -53,75 +53,75 @@ link_document_create_multiple = Link( ) link_source_check_now = Link( kwargs={'source_id': 'resolved_object.pk'}, - permissions=(permission_sources_edit,), text=_('Check now'), + permission=permission_sources_edit, text=_('Check now'), view='sources:source_check' ) link_source_create_imap_email = Link( icon_class=icon_source_create, kwargs={'source_type': '"%s"' % SOURCE_CHOICE_EMAIL_IMAP}, - permissions=(permission_sources_create,), - text=_('Add new IMAP email'), view='sources:source_create' + permission=permission_sources_create, text=_('Add new IMAP email'), + view='sources:source_create' ) link_source_create_pop3_email = Link( icon_class=icon_source_create, kwargs={'source_type': '"%s"' % SOURCE_CHOICE_EMAIL_POP3}, - permissions=(permission_sources_create,), - text=_('Add new POP3 email'), view='sources:source_create' + permission=permission_sources_create, text=_('Add new POP3 email'), + view='sources:source_create' ) link_source_create_staging_folder = Link( icon_class=icon_source_create, kwargs={'source_type': '"%s"' % SOURCE_CHOICE_STAGING}, - permissions=(permission_sources_create,), + permission=permission_sources_create, text=_('Add new staging folder'), view='sources:source_create' ) link_source_create_watch_folder = Link( icon_class=icon_source_create, kwargs={'source_type': '"%s"' % SOURCE_CHOICE_WATCH}, - permissions=(permission_sources_create,), + permission=permission_sources_create, text=_('Add new watch folder'), view='sources:source_create' ) link_source_create_webform = Link( icon_class=icon_source_create, kwargs={'source_type': '"%s"' % SOURCE_CHOICE_WEB_FORM}, - permissions=(permission_sources_create,), + permission=permission_sources_create, text=_('Add new webform source'), view='sources:source_create' ) link_source_create_sane_scanner = Link( icon_class=icon_source_create, kwargs={'source_type': '"%s"' % SOURCE_CHOICE_SANE_SCANNER}, - permissions=(permission_sources_create,), + permission=permission_sources_create, text=_('Add new SANE scanner'), view='sources:source_create' ) link_source_delete = Link( kwargs={'source_id': 'resolved_object.pk'}, - permissions=(permission_sources_delete,), tags='dangerous', + permission=permission_sources_delete, tags='dangerous', text=_('Delete'), view='sources:source_delete' ) link_source_edit = Link( kwargs={'source_id': 'resolved_object.pk'}, - permissions=(permission_sources_edit,), text=_('Edit'), + permission=permission_sources_edit, text=_('Edit'), view='sources:source_edit' ) link_source_list = Link( icon_class=icon_source_list, - permissions=(permission_sources_view,), text=_('Sources'), + permission=permission_sources_view, text=_('Sources'), view='sources:source_list' ) link_source_logs = Link( icon_class=icon_log, kwargs={'source_id': 'resolved_object.pk'}, - permissions=(permission_sources_view,), text=_('Logs'), + permission=permission_sources_view, text=_('Logs'), view='sources:source_logs' ) link_staging_file_delete = Link( keep_query=True, kwargs={ 'staging_folder_id': 'source.pk', 'encoded_filename': 'object.encoded_filename' - }, permissions=(permission_staging_file_delete,), + }, permission=permission_staging_file_delete, tags='dangerous', text=_('Delete'), view='sources:staging_file_delete' ) link_upload_version = Link( condition=document_new_version_not_blocked, kwargs={'document_pk': 'resolved_object.pk'}, - permissions=(permission_document_new_version,), - text=_('Upload new version'), view='sources:upload_version' + permission=permission_document_new_version, text=_('Upload new version'), + view='sources:upload_version' ) diff --git a/mayan/apps/tags/links.py b/mayan/apps/tags/links.py index 17ce2eee4c..062a44f425 100644 --- a/mayan/apps/tags/links.py +++ b/mayan/apps/tags/links.py @@ -6,10 +6,10 @@ from mayan.apps.documents.icons import icon_document_list from mayan.apps.navigation import Link, get_cascade_condition from .icons import ( - icon_multiple_documents_tag_attach, icon_multiple_documents_tag_remove, - icon_tag_attach, icon_tag_create, icon_tag_delete, icon_tag_edit, + icon_document_multiple_tag_multiple_remove, icon_document_multiple_tag_multiple_remove, + icon_document_tag_multiple_attach, icon_tag_create, icon_tag_delete, icon_tag_edit, icon_tag_document_list, icon_tag_list, icon_tag_multiple_delete, - icon_tag_remove + icon_document_tag_multiple_remove ) from .permissions import ( permission_tag_attach, permission_tag_create, permission_tag_delete, @@ -19,39 +19,38 @@ from .permissions import ( link_document_tag_list = Link( args='resolved_object.pk', icon_class=icon_tag_document_list, - permissions=(permission_tag_view,), text=_('Tags'), - view='tags:document_tags', + permission=permission_tag_view, text=_('Tags'), view='tags:document_tags' ) -link_multiple_documents_tag_remove = Link( - icon_class=icon_multiple_documents_tag_remove, text=_('Remove tag'), - view='tags:multiple_documents_selection_tag_remove' +link_document_multiple_tag_multiple_attach = Link( + icon_class=icon_document_multiple_tag_multiple_remove, text=_('Attach tags'), + view='tags:document_multiple_tag_multiple_attach' ) -link_multiple_documents_attach_tag = Link( - icon_class=icon_multiple_documents_tag_attach, text=_('Attach tags'), - view='tags:multiple_documents_tag_attach' +link_document_multiple_tag_multiple_remove = Link( + icon_class=icon_document_multiple_tag_multiple_remove, text=_('Remove tag'), + view='tags:document_multiple_tag_multiple_remove' ) -link_single_document_multiple_tag_remove = Link( - args='object.id', icon_class=icon_tag_remove, - permissions=(permission_tag_remove,), text=_('Remove tags'), - view='tags:single_document_multiple_tag_remove', +link_document_tag_multiple_attach = Link( + args='object.pk', icon_class=icon_document_tag_multiple_attach, + permission=permission_tag_attach, text=_('Attach tags'), + view='tags:document_tag_multiple_attach' ) -link_tag_attach = Link( - args='object.pk', icon_class=icon_tag_attach, - permissions=(permission_tag_attach,), text=_('Attach tags'), - view='tags:tag_attach', +link_document_tag_multiple_remove = Link( + args='object.id', icon_class=icon_document_tag_multiple_remove, + permission=permission_tag_remove, text=_('Remove tags'), + view='tags:document_tag_multiple_remove' ) link_tag_create = Link( - icon_class=icon_tag_create, permissions=(permission_tag_create,), + icon_class=icon_tag_create, permission=permission_tag_create, text=_('Create new tag'), view='tags:tag_create' ) link_tag_delete = Link( args='object.id', icon_class=icon_tag_delete, - permissions=(permission_tag_delete,), tags='dangerous', text=_('Delete'), - view='tags:tag_delete', + permission=permission_tag_delete, tags='dangerous', text=_('Delete'), + view='tags:tag_delete' ) link_tag_edit = Link( args='object.id', icon_class=icon_tag_edit, - permissions=(permission_tag_edit,), text=_('Edit'), view='tags:tag_edit', + permission=permission_tag_edit, text=_('Edit'), view='tags:tag_edit' ) link_tag_list = Link( condition=get_cascade_condition( @@ -60,10 +59,10 @@ link_tag_list = Link( ), icon_class=icon_tag_list, text=_('All'), view='tags:tag_list' ) link_tag_multiple_delete = Link( - icon_class=icon_tag_multiple_delete, permissions=(permission_tag_delete,), + icon_class=icon_tag_multiple_delete, permission=permission_tag_delete, text=_('Delete'), view='tags:tag_multiple_delete' ) link_tag_tagged_item_list = Link( args='object.id', icon_class=icon_document_list, text=('Documents'), - view='tags:tag_tagged_item_list', + view='tags:tag_tagged_item_list' ) diff --git a/mayan/apps/task_manager/links.py b/mayan/apps/task_manager/links.py index 1e88569078..d7f76a8261 100644 --- a/mayan/apps/task_manager/links.py +++ b/mayan/apps/task_manager/links.py @@ -8,22 +8,22 @@ from .icons import icon_task_manager, icon_queue_list from .permissions import permission_task_view link_task_manager = Link( - icon_class=icon_task_manager, permissions=(permission_task_view,), + icon_class=icon_task_manager, permission=permission_task_view, text=_('Task manager'), view='task_manager:queue_list' ) link_queue_list = Link( - icon_class=icon_queue_list, permissions=(permission_task_view,), + icon_class=icon_queue_list, permission=permission_task_view, text=_('Background task queues'), view='task_manager:queue_list' ) link_queue_active_task_list = Link( - args='resolved_object.name', permissions=(permission_task_view,), + args='resolved_object.name', permission=permission_task_view, text=_('Active tasks'), view='task_manager:queue_active_task_list' ) link_queue_reserved_task_list = Link( - args='resolved_object.name', permissions=(permission_task_view,), + args='resolved_object.name', permission=permission_task_view, text=_('Reserved tasks'), view='task_manager:queue_reserved_task_list' ) link_queue_scheduled_task_list = Link( - args='resolved_object.name', permissions=(permission_task_view,), + args='resolved_object.name', permission=permission_task_view, text=_('Scheduled tasks'), view='task_manager:queue_scheduled_task_list' ) diff --git a/mayan/apps/user_management/links.py b/mayan/apps/user_management/links.py index 2eb580649e..ed75f17ab8 100644 --- a/mayan/apps/user_management/links.py +++ b/mayan/apps/user_management/links.py @@ -34,78 +34,78 @@ link_current_user_edit = Link( view='user_management:current_user_edit' ) link_group_create = Link( - icon_class=icon_group_create, permissions=(permission_group_create,), + icon_class=icon_group_create, permission=permission_group_create, text=_('Create new group'), view='user_management:group_create' ) link_group_delete = Link( args='object.id', icon_class=icon_group_delete, - permissions=(permission_group_delete,), tags='dangerous', + permission=permission_group_delete, tags='dangerous', text=_('Delete'), view='user_management:group_delete', ) link_group_edit = Link( args='object.id', icon_class=icon_group_edit, - permissions=(permission_group_edit,), text=_('Edit'), + permission=permission_group_edit, text=_('Edit'), view='user_management:group_edit', ) link_group_list = Link( - icon_class=icon_group_list, permissions=(permission_group_view,), + icon_class=icon_group_list, permission=permission_group_view, text=_('Groups'), view='user_management:group_list' ) link_group_members = Link( args='object.id', icon_class=icon_group_members, - permissions=(permission_group_edit,), text=_('Users'), + permission=permission_group_edit, text=_('Users'), view='user_management:group_members', ) link_group_setup = Link( - icon_class=icon_group_setup, permissions=(permission_group_view,), + icon_class=icon_group_setup, permission=permission_group_view, text=_('Groups'), view='user_management:group_list' ) link_user_create = Link( - icon_class=icon_user_create, permissions=(permission_user_create,), + icon_class=icon_user_create, permission=permission_user_create, text=_('Create new user'), view='user_management:user_create' ) link_user_delete = Link( args='object.id', icon_class=icon_user_delete, - permissions=(permission_user_delete,), tags='dangerous', text=_('Delete'), + permission=permission_user_delete, tags='dangerous', text=_('Delete'), view='user_management:user_delete', ) link_user_edit = Link( args='object.id', icon_class=icon_user_edit, - permissions=(permission_user_edit,), text=_('Edit'), + permission=permission_user_edit, text=_('Edit'), view='user_management:user_edit', ) link_user_groups = Link( args='object.id', condition=condition_is_not_superuser, - icon_class=icon_group, permissions=(permission_user_edit,), + icon_class=icon_group, permission=permission_user_edit, text=_('Groups'), view='user_management:user_groups', ) link_user_list = Link( - icon_class=icon_user_list, permissions=(permission_user_view,), + icon_class=icon_user_list, permission=permission_user_view, text=_('Users'), view='user_management:user_list' ) link_user_multiple_delete = Link( icon_class=icon_user_multiple_delete, - permissions=(permission_user_delete,), tags='dangerous', text=_('Delete'), + permission=permission_user_delete, tags='dangerous', text=_('Delete'), view='user_management:user_multiple_delete' ) link_user_multiple_set_password = Link( icon_class=icon_user_multiple_set_password, - permissions=(permission_user_edit,), text=_('Set password'), + permission=permission_user_edit, text=_('Set password'), view='user_management:user_multiple_set_password' ) link_user_set_options = Link( args='object.id', icon_class=icon_user_set_options, - permissions=(permission_user_edit,), text=_('User options'), + permission=permission_user_edit, text=_('User options'), view='user_management:user_options', ) link_user_set_password = Link( args='object.id', icon_class=icon_user_set_password, - permissions=(permission_user_edit,), text=_('Set password'), + permission=permission_user_edit, text=_('Set password'), view='user_management:user_set_password', ) link_user_setup = Link( - icon_class=icon_user_setup, permissions=(permission_user_view,), + icon_class=icon_user_setup, permission=permission_user_view, text=_('Users'), view='user_management:user_list' )