diff --git a/mayan/apps/document_indexing/__init__.py b/mayan/apps/document_indexing/__init__.py index 25475e2e3c..7cb28291d4 100644 --- a/mayan/apps/document_indexing/__init__.py +++ b/mayan/apps/document_indexing/__init__.py @@ -47,7 +47,7 @@ register_maintenance_links([rebuild_index_instances], namespace='document_indexi register_links(Document, [document_index_list], menu_name='form_header') register_links([Index, 'indexing:index_setup_list', 'indexing:index_setup_create', 'indexing:template_node_edit', 'indexing:template_node_delete'], [index_setup_list, index_setup_create], menu_name='secondary_menu') -register_links(Index, [index_setup_edit, index_setup_delete, index_setup_view, index_setup_document_types]) +register_links(Index, [index_setup_edit, index_setup_view, index_setup_document_types, index_setup_delete]) register_links(IndexInstanceNode, [index_parent]) register_links(IndexTemplateNode, [template_node_create, template_node_edit, template_node_delete]) diff --git a/mayan/apps/documents/__init__.py b/mayan/apps/documents/__init__.py index 4454ee14cb..78af5248ec 100644 --- a/mayan/apps/documents/__init__.py +++ b/mayan/apps/documents/__init__.py @@ -68,7 +68,7 @@ register_history_type(HISTORY_DOCUMENT_EDITED) register_history_type(HISTORY_DOCUMENT_DELETED) # Register document type links -register_links(DocumentType, [document_type_edit, document_type_delete, document_type_filename_list]) +register_links(DocumentType, [document_type_edit, document_type_filename_list, document_type_delete]) register_links(DocumentTypeFilename, [document_type_filename_edit, document_type_filename_delete]) register_links(['documents:setup_document_type_metadata', 'documents:document_type_filename_delete', 'documents:document_type_create', 'documents:document_type_filename_create', 'documents:document_type_filename_edit', 'documents:document_type_filename_list', 'documents:document_type_list', 'documents:document_type_edit', 'documents:document_type_delete'], [document_type_list, document_type_create], menu_name='secondary_menu') register_links([DocumentTypeFilename, 'documents:document_type_filename_list', 'documents:document_type_filename_create'], [document_type_filename_create], menu_name='sidebar') diff --git a/mayan/apps/folders/__init__.py b/mayan/apps/folders/__init__.py index d8865fc5ab..11d70f21dc 100644 --- a/mayan/apps/folders/__init__.py +++ b/mayan/apps/folders/__init__.py @@ -23,7 +23,7 @@ from .permissions import (PERMISSION_FOLDER_ADD_DOCUMENT, from .urls import api_urls register_links(Document, [document_folder_list], menu_name='form_header') -register_links(Folder, [folder_view, folder_edit, folder_delete, folder_acl_list]) +register_links(Folder, [folder_view, folder_edit, folder_acl_list, folder_delete]) register_links([Folder, 'folders:folder_list', 'folders:folder_create'], [folder_list, folder_create], menu_name='secondary_menu') register_links(['folders:document_folder_list', 'folders:folder_add_document'], [folder_add_document], menu_name="sidebar") diff --git a/mayan/apps/linking/__init__.py b/mayan/apps/linking/__init__.py index ca71718582..3d1c8d843a 100644 --- a/mayan/apps/linking/__init__.py +++ b/mayan/apps/linking/__init__.py @@ -18,7 +18,7 @@ from .permissions import (PERMISSION_SMART_LINK_DELETE, PERMISSION_SMART_LINK_VIEW) register_links(Document, [smart_link_instances_for_document], menu_name='form_header') -register_links(SmartLink, [smart_link_edit, smart_link_delete, smart_link_condition_list, smart_link_acl_list]) +register_links(SmartLink, [smart_link_edit, smart_link_condition_list, smart_link_acl_list, smart_link_delete]) register_links([SmartLink, 'linking:smart_link_list', 'linking:smart_link_create'], [smart_link_list, smart_link_create], menu_name='secondary_menu') register_links(SmartLinkCondition, [smart_link_condition_edit, smart_link_condition_delete]) register_links(['linking:smart_link_condition_list', 'linking:smart_link_condition_create', 'linking:smart_link_condition_edit', 'linking:smart_link_condition_delete'], [smart_link_condition_create], menu_name='sidebar') diff --git a/mayan/apps/permissions/__init__.py b/mayan/apps/permissions/__init__.py index f6a2387d46..a59dcbbf9a 100644 --- a/mayan/apps/permissions/__init__.py +++ b/mayan/apps/permissions/__init__.py @@ -13,8 +13,8 @@ from .links import (permission_grant, permission_revoke, role_create, role_permissions) from .settings import DEFAULT_ROLES -register_links(Role, [role_delete, role_edit, role_members, role_permissions]) -register_links([Role, 'permissions:role_create', 'permissions:role_list'], [role_create, role_list], menu_name='secondary_menu') +register_links(Role, [role_edit, role_members, role_permissions, role_delete]) +register_links([Role, 'permissions:role_create', 'permissions:role_list'], [role_list, role_create], menu_name='secondary_menu') register_multi_item_links(['permissions:role_permissions'], [permission_grant, permission_revoke]) permission_views = ['permissions:role_list', 'permissions:role_create', 'permissions:role_edit', 'permissions:role_members', 'permissions:role_permissions', 'permissions:role_delete'] diff --git a/mayan/apps/sources/__init__.py b/mayan/apps/sources/__init__.py index b8fcd33677..cf42aadcb4 100644 --- a/mayan/apps/sources/__init__.py +++ b/mayan/apps/sources/__init__.py @@ -27,7 +27,7 @@ from .widgets import staging_file_thumbnail register_links([StagingFile], [staging_file_delete]) register_links([Source, 'sources:setup_source_list', 'sources:setup_source_create'], [setup_sources, setup_source_create_webform, setup_source_create_staging_folder, setup_source_create_pop3_email, setup_source_create_imap_email], menu_name='secondary_menu') -register_links([Source], [setup_source_edit, setup_source_delete, setup_source_transformation_list]) +register_links([Source], [setup_source_edit, setup_source_transformation_list, setup_source_delete]) register_links(SourceTransformation, [setup_source_transformation_edit, setup_source_transformation_delete]) register_links(['sources:setup_source_transformation_create', 'sources:setup_source_transformation_edit', 'sources:setup_source_transformation_delete', 'sources:setup_source_transformation_list'], [setup_source_transformation_create], menu_name='sidebar') diff --git a/mayan/apps/tags/__init__.py b/mayan/apps/tags/__init__.py index e1f39ea4e0..c4ea65c80a 100644 --- a/mayan/apps/tags/__init__.py +++ b/mayan/apps/tags/__init__.py @@ -51,7 +51,7 @@ register_model_list_columns(Document, [ }, ]) -register_links(Tag, [tag_tagged_item_list, tag_edit, tag_delete, tag_acl_list]) +register_links(Tag, [tag_tagged_item_list, tag_edit, tag_acl_list, tag_delete]) register_multi_item_links(['tags:tag_list'], [tag_multiple_delete]) register_links([Tag, 'tags:tag_list', 'tags:tag_create'], [tag_list, tag_create], menu_name='secondary_menu') register_top_menu('tags', link={'text': _(u'Tags'), 'view': 'tags:tag_list', 'famfam': 'tag_blue'}, children_view_regex=[r'^tag_(list|create|delete|edit|tagged|acl)'])