diff --git a/HISTORY.rst b/HISTORY.rst index 046af43645..670261ebf6 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -122,6 +122,8 @@ * Update document parsing link activation. * Add favorite document views tests. * Add document state action view test. +* Remove sidebar menu instance. The secondary menu and the + previour sidebar menu now perform the same function. 3.1.11 (2019-04-XX) =================== @@ -132,7 +134,7 @@ * Add DOCUMENTS_HASH_BLOCK_SIZE to control the size of the file block when calculating a document's checksum. -a3.1.10 (2019-04-04) +3.1.10 (2019-04-04) =================== * Backport test case improvements from the development branch. Add random primary key mixin. Split test case code into mixins. Make the view test diff --git a/docs/releases/3.2.rst b/docs/releases/3.2.rst index d7a12b1643..9109e6b45a 100644 --- a/docs/releases/3.2.rst +++ b/docs/releases/3.2.rst @@ -154,6 +154,8 @@ Other changes * Update document parsing link activation. * Add favorite document views tests. * Add document state action view test. +* Remove sidebar menu instance. The secondary menu and the + previour sidebar menu now perform the same function. Removals -------- diff --git a/mayan/apps/common/menus.py b/mayan/apps/common/menus.py index 72ee8843c1..d990fc9490 100644 --- a/mayan/apps/common/menus.py +++ b/mayan/apps/common/menus.py @@ -6,11 +6,6 @@ from mayan.apps.navigation import Menu from .icons import icon_menu_about, icon_menu_user -__all__ = ( - 'menu_about', 'menu_facet', 'menu_object', 'menu_main', 'menu_multi_item', - 'menu_secondary', 'menu_setup', 'menu_sidebar', 'menu_tools', 'menu_user' -) - menu_about = Menu( icon_class=icon_menu_about, label=_('System'), name='about' ) @@ -21,7 +16,6 @@ menu_multi_item = Menu(name='multi item') menu_object = Menu(label=_('Actions'), name='object') menu_secondary = Menu(label=_('Secondary'), name='secondary') menu_setup = Menu(name='setup') -menu_sidebar = Menu(name='sidebar') menu_tools = Menu(name='tools') menu_user = Menu( icon_class=icon_menu_user, name='user', label=_('User') diff --git a/mayan/apps/converter/apps.py b/mayan/apps/converter/apps.py index cef38b17a0..e0df3d274f 100644 --- a/mayan/apps/converter/apps.py +++ b/mayan/apps/converter/apps.py @@ -4,7 +4,7 @@ from django.utils.encoding import force_text from django.utils.translation import ugettext_lazy as _ from mayan.apps.common.apps import MayanAppConfig -from mayan.apps.common.menus import menu_object, menu_sidebar +from mayan.apps.common.menus import menu_object, menu_secondary from mayan.apps.navigation import SourceColumn from .links import ( @@ -39,10 +39,10 @@ class ConverterApp(MayanAppConfig): links=(link_transformation_edit, link_transformation_delete), sources=(Transformation,) ) - menu_sidebar.bind_links( + menu_secondary.bind_links( links=(link_transformation_create,), sources=(Transformation,) ) - menu_sidebar.bind_links( + menu_secondary.bind_links( links=(link_transformation_create,), sources=( 'converter:transformation_create', diff --git a/mayan/apps/django_gpg/apps.py b/mayan/apps/django_gpg/apps.py index 86799beec8..f88572d746 100644 --- a/mayan/apps/django_gpg/apps.py +++ b/mayan/apps/django_gpg/apps.py @@ -7,7 +7,7 @@ from mayan.apps.acls.links import link_acl_list from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view from mayan.apps.common.apps import MayanAppConfig from mayan.apps.common.menus import ( - menu_facet, menu_object, menu_setup, menu_sidebar + menu_facet, menu_object, menu_secondary, menu_setup ) from mayan.apps.navigation import SourceColumn @@ -70,7 +70,6 @@ class DjangoGPGApp(MayanAppConfig): links=(link_acl_list, link_key_delete, link_key_download,), sources=(Key,) ) - menu_setup.bind_links(links=(link_key_setup,)) menu_facet.bind_links( links=(link_private_keys, link_public_keys), sources=( @@ -79,7 +78,7 @@ class DjangoGPGApp(MayanAppConfig): 'django_gpg:key_upload', Key, KeyStub ) ) - menu_sidebar.bind_links( + menu_secondary.bind_links( links=(link_key_query, link_key_upload), sources=( 'django_gpg:key_public_list', 'django_gpg:key_private_list', @@ -87,3 +86,4 @@ class DjangoGPGApp(MayanAppConfig): 'django_gpg:key_upload', Key, KeyStub ) ) + menu_setup.bind_links(links=(link_key_setup,)) diff --git a/mayan/apps/document_comments/apps.py b/mayan/apps/document_comments/apps.py index c23f196e56..a5bb9fb974 100644 --- a/mayan/apps/document_comments/apps.py +++ b/mayan/apps/document_comments/apps.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.acls.classes import ModelPermission from mayan.apps.common.apps import MayanAppConfig -from mayan.apps.common.menus import menu_facet, menu_object, menu_sidebar +from mayan.apps.common.menus import menu_facet, menu_object, menu_secondary from mayan.apps.documents.search import document_page_search, document_search from mayan.apps.events import ModelEventType from mayan.apps.navigation import SourceColumn @@ -68,7 +68,7 @@ class DocumentCommentsApp(MayanAppConfig): label=_('Comments') ) - menu_sidebar.bind_links( + menu_secondary.bind_links( links=(link_comment_add,), sources=( 'comments:comments_for_document', 'comments:comment_add', diff --git a/mayan/apps/document_signatures/apps.py b/mayan/apps/document_signatures/apps.py index df9b149e16..b7bade53ae 100644 --- a/mayan/apps/document_signatures/apps.py +++ b/mayan/apps/document_signatures/apps.py @@ -11,7 +11,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.acls.classes import ModelPermission from mayan.apps.common.apps import MayanAppConfig from mayan.apps.common.menus import ( - menu_facet, menu_object, menu_sidebar, menu_tools + menu_facet, menu_object, menu_secondary, menu_tools ) from mayan.apps.navigation import SourceColumn from mayan.celery import app @@ -148,7 +148,7 @@ class DocumentSignaturesApp(MayanAppConfig): link_document_version_signature_delete, ), sources=(SignatureBaseModel,) ) - menu_sidebar.bind_links( + menu_secondary.bind_links( links=( link_document_version_signature_upload, ), sources=(DocumentVersion,) diff --git a/mayan/apps/documents/apps.py b/mayan/apps/documents/apps.py index f596957966..722de215c8 100644 --- a/mayan/apps/documents/apps.py +++ b/mayan/apps/documents/apps.py @@ -14,7 +14,7 @@ from mayan.apps.common.apps import MayanAppConfig from mayan.apps.common.classes import MissingItem, ModelField, Template from mayan.apps.common.menus import ( menu_facet, menu_list_facet, menu_main, menu_object, menu_secondary, - menu_setup, menu_sidebar, menu_multi_item, menu_tools + menu_setup, menu_multi_item, menu_tools ) from mayan.apps.common.signals import post_initial_setup from mayan.apps.common.widgets import TwoStateWidget @@ -485,14 +485,14 @@ class DocumentsApp(MayanAppConfig): 'documents:document_type_list' ) ) - menu_sidebar.bind_links( + menu_secondary.bind_links( links=(link_document_type_filename_create,), sources=( DocumentTypeFilename, 'documents:document_type_filename_list', 'documents:document_type_filename_create' ) ) - menu_sidebar.bind_links( + menu_secondary.bind_links( links=(link_trash_can_empty,), sources=( 'documents:document_list_deleted', 'documents:trash_can_empty' diff --git a/mayan/apps/dynamic_search/apps.py b/mayan/apps/dynamic_search/apps.py index 467ae05063..efbbf1fa6f 100644 --- a/mayan/apps/dynamic_search/apps.py +++ b/mayan/apps/dynamic_search/apps.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ from mayan.apps.common.apps import MayanAppConfig -from mayan.apps.common.menus import menu_facet, menu_sidebar +from mayan.apps.common.menus import menu_facet, menu_secondary from .links import link_search, link_search_advanced, link_search_again @@ -25,6 +25,6 @@ class DynamicSearchApp(MayanAppConfig): 'search:search', 'search:search_advanced', 'search:results' ) ) - menu_sidebar.bind_links( + menu_secondary.bind_links( links=(link_search_again,), sources=('search:results',) ) diff --git a/mayan/apps/linking/apps.py b/mayan/apps/linking/apps.py index df10a152f0..fc43abc70c 100644 --- a/mayan/apps/linking/apps.py +++ b/mayan/apps/linking/apps.py @@ -8,8 +8,7 @@ from mayan.apps.acls.links import link_acl_list from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view from mayan.apps.common.apps import MayanAppConfig from mayan.apps.common.menus import ( - menu_facet, menu_list_facet, menu_object, menu_secondary, menu_setup, - menu_sidebar + menu_facet, menu_list_facet, menu_object, menu_secondary, menu_setup ) from mayan.apps.common.widgets import TwoStateWidget from mayan.apps.navigation import SourceColumn @@ -112,8 +111,7 @@ class LinkingApp(MayanAppConfig): 'linking:smart_link_create' ) ) - menu_setup.bind_links(links=(link_smart_link_setup,)) - menu_sidebar.bind_links( + menu_secondary.bind_links( links=(link_smart_link_condition_create,), sources=( 'linking:smart_link_condition_list', @@ -122,3 +120,4 @@ class LinkingApp(MayanAppConfig): 'linking:smart_link_condition_delete' ) ) + menu_setup.bind_links(links=(link_smart_link_setup,)) diff --git a/mayan/apps/metadata/apps.py b/mayan/apps/metadata/apps.py index 4f8ffea7bf..6326797f9d 100644 --- a/mayan/apps/metadata/apps.py +++ b/mayan/apps/metadata/apps.py @@ -15,7 +15,7 @@ from mayan.apps.common.apps import MayanAppConfig from mayan.apps.common.classes import ModelAttribute, ModelField from mayan.apps.common.menus import ( menu_facet, menu_list_facet, menu_multi_item, menu_object, menu_secondary, - menu_setup, menu_sidebar + menu_setup ) from mayan.apps.common.widgets import TwoStateWidget from mayan.apps.documents.search import document_page_search, document_search @@ -237,7 +237,7 @@ class MetadataApp(MayanAppConfig): ) ) menu_setup.bind_links(links=(link_setup_metadata_type_list,)) - menu_sidebar.bind_links( + menu_secondary.bind_links( links=( link_metadata_add, link_metadata_edit, link_metadata_remove ), sources=( diff --git a/mayan/apps/smart_settings/apps.py b/mayan/apps/smart_settings/apps.py index e058b26980..26b059ed5d 100644 --- a/mayan/apps/smart_settings/apps.py +++ b/mayan/apps/smart_settings/apps.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ from mayan.apps.common.apps import MayanAppConfig -from mayan.apps.common.menus import menu_sidebar, menu_setup, menu_object +from mayan.apps.common.menus import menu_secondary, menu_setup, menu_object from mayan.apps.navigation import SourceColumn from .classes import Namespace, Setting @@ -48,7 +48,7 @@ class SmartSettingsApp(MayanAppConfig): menu_object.bind_links( links=(link_setting_edit,), sources=(Setting,) ) - menu_sidebar.bind_links( + menu_secondary.bind_links( links=(link_namespace_root_list,), sources=( Namespace, Setting, 'settings:namespace_list', ) diff --git a/mayan/apps/sources/apps.py b/mayan/apps/sources/apps.py index 79d3a92b5e..60a9c73596 100644 --- a/mayan/apps/sources/apps.py +++ b/mayan/apps/sources/apps.py @@ -7,7 +7,7 @@ from kombu import Exchange, Queue from mayan.apps.common.apps import MayanAppConfig from mayan.apps.common.classes import MissingItem from mayan.apps.common.menus import ( - menu_list_facet, menu_object, menu_secondary, menu_sidebar, menu_setup + menu_list_facet, menu_object, menu_secondary, menu_setup ) from mayan.apps.common.signals import post_initial_setup, post_upgrade from mayan.apps.converter.links import link_transformation_list @@ -164,7 +164,7 @@ class SourcesApp(MayanAppConfig): ) ) menu_setup.bind_links(links=(link_setup_sources,)) - menu_sidebar.bind_links( + menu_secondary.bind_links( links=(link_upload_version,), sources=( 'documents:document_version_list', 'documents:upload_version',