From a8361c8fcd18dcab4cea75a7cab2db4b887143dc Mon Sep 17 00:00:00 2001 From: Younn Olivier Date: Thu, 8 Sep 2022 12:09:14 +0000 Subject: [PATCH] [MOV] website, *: move navbar patch to website custom menus service *: website_event, website_links This commit moves the current navbar patch, defined with [1], to a service. This service will be implemented in the next commit and used by both the navbar and the burger menu patches. [1]: https://github.com/odoo/odoo/commit/31cc10b91dc7762e23b4bde9b945be0c4ce3fe3b task-2687506 Part-of: odoo/odoo#99605 --- addons/website/__manifest__.py | 2 +- .../navbar/navbar.js => services/website_custom_menus.js} | 0 addons/website_event/__manifest__.py | 2 +- .../navbar/navbar.js => services/website_custom_menus.js} | 0 addons/website_links/__manifest__.py | 2 +- .../navbar/navbar.js => services/website_custom_menus.js} | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename addons/website/static/src/{components/navbar/navbar.js => services/website_custom_menus.js} (100%) rename addons/website_event/static/src/js/{components/navbar/navbar.js => services/website_custom_menus.js} (100%) rename addons/website_links/static/src/{components/navbar/navbar.js => services/website_custom_menus.js} (100%) diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py index 252a2a343df..a3fbdab52ae 100644 --- a/addons/website/__manifest__.py +++ b/addons/website/__manifest__.py @@ -241,7 +241,6 @@ 'website/static/src/components/dialog/*.scss', 'website/static/src/components/editor/editor.js', 'website/static/src/components/editor/editor.scss', - 'website/static/src/components/navbar/navbar.js', 'website/static/src/components/switch/switch.js', 'website/static/src/components/switch/switch.scss', 'website/static/src/components/wysiwyg_adapter/wysiwyg_adapter.js', @@ -250,6 +249,7 @@ 'website/static/src/components/translator/translator.scss', 'website/static/src/js/form_editor_registry.js', 'website/static/src/js/new_content_form.js', + 'website/static/src/services/website_custom_menus.js', 'website/static/src/js/tours/homepage.js', 'website/static/src/systray_items/*.js', 'website/static/src/systray_items/*.scss', diff --git a/addons/website/static/src/components/navbar/navbar.js b/addons/website/static/src/services/website_custom_menus.js similarity index 100% rename from addons/website/static/src/components/navbar/navbar.js rename to addons/website/static/src/services/website_custom_menus.js diff --git a/addons/website_event/__manifest__.py b/addons/website_event/__manifest__.py index a1a323ee62d..11dc2faa965 100644 --- a/addons/website_event/__manifest__.py +++ b/addons/website_event/__manifest__.py @@ -66,7 +66,7 @@ ], 'website.assets_editor': [ 'website_event/static/src/js/systray_items/*.js', - 'website_event/static/src/js/components/navbar/navbar.js', + 'website_event/static/src/js/services/website_custom_menus.js', ], }, 'license': 'LGPL-3', diff --git a/addons/website_event/static/src/js/components/navbar/navbar.js b/addons/website_event/static/src/js/services/website_custom_menus.js similarity index 100% rename from addons/website_event/static/src/js/components/navbar/navbar.js rename to addons/website_event/static/src/js/services/website_custom_menus.js diff --git a/addons/website_links/__manifest__.py b/addons/website_links/__manifest__.py index 2af6b989591..b83c9368840 100644 --- a/addons/website_links/__manifest__.py +++ b/addons/website_links/__manifest__.py @@ -26,7 +26,7 @@ Those trackers can be used in Google Analytics to track clicks and visitors, or 'website_links/static/tests/**/*', ], 'website.assets_editor': [ - 'website_links/static/src/components/navbar/navbar.js', + 'website_links/static/src/services/website_custom_menus.js', ], 'web.assets_qweb': [ 'website_links/static/src/xml/*.xml', diff --git a/addons/website_links/static/src/components/navbar/navbar.js b/addons/website_links/static/src/services/website_custom_menus.js similarity index 100% rename from addons/website_links/static/src/components/navbar/navbar.js rename to addons/website_links/static/src/services/website_custom_menus.js