From 85372ffa9426e2ef52844a733d84f36bf4a5ca72 Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Fri, 20 Oct 2023 12:04:09 +0200 Subject: [PATCH] [REF] web,*: remove last legacy stuff from several bundles This commit removes the last low level legacy stuff (e.g. Widget, mixins...) from the backend bundle, and from the webclient bundles of mrp_subcontracting and project. They are no longer used in the backend. There're still necessary for the frontend and for the web_editor though, so we had to manually add them in the lazy loaded bundle of the editor. Hopefully, the last widgets and dialogs will be converted soon, and we'll finally get rid of all those legacy files. Part-of: odoo/odoo#139154 --- addons/mrp_subcontracting/__manifest__.py | 1 - addons/project/__manifest__.py | 2 -- addons/web/__manifest__.py | 8 -------- addons/web_editor/__manifest__.py | 9 +++++++++ 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/addons/mrp_subcontracting/__manifest__.py b/addons/mrp_subcontracting/__manifest__.py index d70b6fa22b8..3c95ac63297 100644 --- a/addons/mrp_subcontracting/__manifest__.py +++ b/addons/mrp_subcontracting/__manifest__.py @@ -54,7 +54,6 @@ 'web/static/src/scss/mimetypes.scss', 'web/static/src/scss/ui.scss', 'web/static/src/legacy/scss/ui.scss', - 'web/static/src/legacy/scss/modal.scss', 'web/static/src/views/fields/translation_dialog.scss', 'web/static/src/scss/fontawesome_overridden.scss', diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py index b0353bf3ddf..cc14f87e338 100644 --- a/addons/project/__manifest__.py +++ b/addons/project/__manifest__.py @@ -104,7 +104,6 @@ 'web/static/src/scss/mimetypes.scss', 'web/static/src/scss/ui.scss', 'web/static/src/legacy/scss/ui.scss', - 'web/static/src/legacy/scss/modal.scss', 'web/static/src/views/fields/translation_dialog.scss', 'web/static/src/scss/fontawesome_overridden.scss', @@ -140,7 +139,6 @@ 'web/static/src/legacy/js/libs/autocomplete.js', 'web/static/src/legacy/js/libs/bootstrap.js', 'web/static/src/legacy/js/libs/jquery.js', - ('include', 'web._assets_bootstrap_backend'), 'base/static/src/css/modules.css', diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py index b9f65874e04..5e89180fe18 100644 --- a/addons/web/__manifest__.py +++ b/addons/web/__manifest__.py @@ -61,7 +61,6 @@ This module provides the core of the Odoo Web Client. 'web/static/src/scss/ui.scss', 'web/static/src/views/fields/translation_dialog.scss', 'web/static/src/legacy/scss/ui.scss', - 'web/static/src/legacy/scss/modal.scss', 'web/static/src/legacy/js/promise_extension.js', @@ -89,13 +88,6 @@ This module provides the core of the Odoo Web Client. 'web/static/src/legacy/js/libs/autocomplete.js', 'web/static/src/legacy/js/libs/bootstrap.js', 'web/static/src/legacy/js/libs/jquery.js', - 'web/static/src/legacy/js/core/class.js', - 'web/static/src/legacy/js/core/dialog.js', - 'web/static/src/legacy/xml/dialog.xml', - 'web/static/src/legacy/js/core/dom.js', - 'web/static/src/legacy/js/core/mixins.js', - 'web/static/src/legacy/js/core/service_mixins.js', - 'web/static/src/legacy/js/core/widget.js', 'base/static/src/css/modules.css', diff --git a/addons/web_editor/__manifest__.py b/addons/web_editor/__manifest__.py index 11e247195b9..3a3cb1f0095 100644 --- a/addons/web_editor/__manifest__.py +++ b/addons/web_editor/__manifest__.py @@ -98,6 +98,15 @@ Odoo Web Editor widget. 'web_editor/static/src/js/editor/odoo-editor/src/checklist.scss', ], 'web_editor.assets_wysiwyg': [ + # legacy stuff that are no longer in assets_backend + 'web/static/src/legacy/js/core/class.js', + 'web/static/src/legacy/js/core/dialog.js', + 'web/static/src/legacy/xml/dialog.xml', + 'web/static/src/legacy/js/core/dom.js', + 'web/static/src/legacy/js/core/mixins.js', + 'web/static/src/legacy/js/core/service_mixins.js', + 'web/static/src/legacy/js/core/widget.js', + # lib 'web_editor/static/lib/cropperjs/cropper.css', 'web_editor/static/lib/cropperjs/cropper.js',