From 5d3601066e2d92dd7a332f0446e01b01f969294e Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Tue, 9 May 2023 08:46:02 +0000 Subject: [PATCH] [FIX] web, *: clean manifests assets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some glob are more complex than they should. Since `**` matches no/one or many directories, the use of /**/**/ is the same as /**/. Since **.js is similar to *.js except if you except to have a js file in a directory ending with js. Moreover ** will match any directory recursively before a js file. closes odoo/odoo#120880 Related: odoo/enterprise#40842 Signed-off-by: Xavier Dollé (xdo) --- addons/web/__manifest__.py | 2 +- addons/website_event_booth_sale/__manifest__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py index 9e71334994a..528806989b3 100644 --- a/addons/web/__manifest__.py +++ b/addons/web/__manifest__.py @@ -506,7 +506,7 @@ This module provides the core of the Odoo Web Client. 'web._assets_primary_variables': [ 'web/static/src/scss/primary_variables.scss', - 'web/static/src/**/**/*.variables.scss', + 'web/static/src/**/*.variables.scss', 'base/static/src/scss/onboarding.variables.scss', ], 'web._assets_secondary_variables': [ diff --git a/addons/website_event_booth_sale/__manifest__.py b/addons/website_event_booth_sale/__manifest__.py index a0910ad87c2..cd74443c2fe 100644 --- a/addons/website_event_booth_sale/__manifest__.py +++ b/addons/website_event_booth_sale/__manifest__.py @@ -18,7 +18,7 @@ Use the e-commerce to sell your event booths. '/website_event_booth_sale/static/src/js/booth_register.js', ], 'web.assets_tests': [ - '/website_event_booth_sale/static/tests/tours/**/**.js' + '/website_event_booth_sale/static/tests/tours/**/*.js' ], }, 'license': 'LGPL-3',