From aed6d0585be5c646e1c3cade419c706dc154efaf Mon Sep 17 00:00:00 2001 From: Benoit Socias Date: Wed, 29 Nov 2023 13:50:59 +0100 Subject: [PATCH] [FIX] theme_*: remove unused configurator snippets When shapes were extracted to configurator snippets in [1], some configurator-specific snippets were created that do not appear on pages of the specific theme. Because in [2] the call to `_generate_primary_snippet_templates` is done on a full list of themes instead of only the installed ones, the problem was not noticed: if any theme defines a block, it's website-side configurator-specific template is generated. This is not the case during an upgrade: the templates are generated only for the installed themes. Because of this some "useless" configurator templates trigger an error when importing their XML definition because their parent template does not exist. This commit fixes this by removing those templates. [1]: https://github.com/odoo/design-themes/commit/d206c119720d557c11320ebb3d7339890b8f9efa [2]: https://github.com/odoo/odoo/commit/928eeca714a161f6bc03343e4dc8af9b050b9841#diff-f49a1e9eda23df9f1d48121ba376a5fabafe70ea18b29d4eab23d737e5d4eeb6R446 closes odoo/design-themes#752 X-original-commit: 7b2782875514e055a8db285fc1d46ec2d3225f70 Related: odoo/odoo#144666 Signed-off-by: Romain Derie (rde) --- .../views/snippets/s_comparisons.xml | 11 -------- theme_artists/views/snippets/s_image_text.xml | 11 -------- theme_artists/views/snippets/s_numbers.xml | 11 -------- theme_artists/views/snippets/s_parallax.xml | 11 -------- .../views/snippets/s_product_catalog.xml | 11 -------- .../views/snippets/s_quotes_carousel.xml | 11 -------- theme_bewise/views/customizations.xml | 9 ------- theme_bistro/views/snippets/s_banner.xml | 10 ------- .../views/snippets/s_product_catalog.xml | 11 -------- theme_buzzy/views/snippets/s_title.xml | 11 -------- theme_clean/views/snippets/s_comparisons.xml | 11 -------- theme_cobalt/views/customizations.xml | 27 ------------------- theme_graphene/views/customizations.xml | 9 ------- theme_kea/views/snippets/s_references.xml | 11 -------- theme_kiddo/views/snippets/s_picture.xml | 12 --------- theme_notes/views/snippets/s_cover.xml | 11 -------- .../views/snippets/s_company_team.xml | 11 -------- theme_odoo_experts/views/snippets/s_cover.xml | 11 -------- .../views/snippets/s_media_list.xml | 10 ------- .../views/snippets/s_numbers.xml | 11 -------- theme_paptic/views/customizations.xml | 11 -------- theme_vehicle/views/customizations.xml | 20 -------------- 22 files changed, 262 deletions(-) diff --git a/theme_anelusia/views/snippets/s_comparisons.xml b/theme_anelusia/views/snippets/s_comparisons.xml index f856f57c6..b9bd565be 100644 --- a/theme_anelusia/views/snippets/s_comparisons.xml +++ b/theme_anelusia/views/snippets/s_comparisons.xml @@ -29,15 +29,4 @@ - - diff --git a/theme_artists/views/snippets/s_image_text.xml b/theme_artists/views/snippets/s_image_text.xml index ff23a561c..69bc716c8 100644 --- a/theme_artists/views/snippets/s_image_text.xml +++ b/theme_artists/views/snippets/s_image_text.xml @@ -27,15 +27,4 @@ - - diff --git a/theme_artists/views/snippets/s_numbers.xml b/theme_artists/views/snippets/s_numbers.xml index 9158ffd43..1bf457e93 100644 --- a/theme_artists/views/snippets/s_numbers.xml +++ b/theme_artists/views/snippets/s_numbers.xml @@ -8,15 +8,4 @@ - - diff --git a/theme_artists/views/snippets/s_parallax.xml b/theme_artists/views/snippets/s_parallax.xml index 1c7d4b79b..a174bd52a 100644 --- a/theme_artists/views/snippets/s_parallax.xml +++ b/theme_artists/views/snippets/s_parallax.xml @@ -8,15 +8,4 @@ - - diff --git a/theme_artists/views/snippets/s_product_catalog.xml b/theme_artists/views/snippets/s_product_catalog.xml index a8f1571ca..77eb28fd4 100644 --- a/theme_artists/views/snippets/s_product_catalog.xml +++ b/theme_artists/views/snippets/s_product_catalog.xml @@ -9,15 +9,4 @@ - - diff --git a/theme_artists/views/snippets/s_quotes_carousel.xml b/theme_artists/views/snippets/s_quotes_carousel.xml index 0a49d2853..ee774d32b 100644 --- a/theme_artists/views/snippets/s_quotes_carousel.xml +++ b/theme_artists/views/snippets/s_quotes_carousel.xml @@ -28,15 +28,4 @@ - - diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml index 80f590cc2..dc0156458 100644 --- a/theme_bewise/views/customizations.xml +++ b/theme_bewise/views/customizations.xml @@ -244,15 +244,6 @@ - - - - diff --git a/theme_bookstore/views/snippets/s_product_catalog.xml b/theme_bookstore/views/snippets/s_product_catalog.xml index 78fd95fe8..098f4b55c 100644 --- a/theme_bookstore/views/snippets/s_product_catalog.xml +++ b/theme_bookstore/views/snippets/s_product_catalog.xml @@ -12,15 +12,4 @@ - - diff --git a/theme_buzzy/views/snippets/s_title.xml b/theme_buzzy/views/snippets/s_title.xml index 02ddda373..7a380f789 100644 --- a/theme_buzzy/views/snippets/s_title.xml +++ b/theme_buzzy/views/snippets/s_title.xml @@ -12,15 +12,4 @@ - - diff --git a/theme_clean/views/snippets/s_comparisons.xml b/theme_clean/views/snippets/s_comparisons.xml index 9e21c9f69..809ededcd 100644 --- a/theme_clean/views/snippets/s_comparisons.xml +++ b/theme_clean/views/snippets/s_comparisons.xml @@ -16,15 +16,4 @@ - - diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml index 2d28f8a51..85a0c9523 100644 --- a/theme_cobalt/views/customizations.xml +++ b/theme_cobalt/views/customizations.xml @@ -80,15 +80,6 @@ - - - - - - - - - - diff --git a/theme_kiddo/views/snippets/s_picture.xml b/theme_kiddo/views/snippets/s_picture.xml index 50d42279c..a7abb7e03 100644 --- a/theme_kiddo/views/snippets/s_picture.xml +++ b/theme_kiddo/views/snippets/s_picture.xml @@ -24,16 +24,4 @@ - - diff --git a/theme_notes/views/snippets/s_cover.xml b/theme_notes/views/snippets/s_cover.xml index 5c77923df..2f0cd1315 100644 --- a/theme_notes/views/snippets/s_cover.xml +++ b/theme_notes/views/snippets/s_cover.xml @@ -8,15 +8,4 @@ - - diff --git a/theme_odoo_experts/views/snippets/s_company_team.xml b/theme_odoo_experts/views/snippets/s_company_team.xml index a8d0331b1..542e177aa 100644 --- a/theme_odoo_experts/views/snippets/s_company_team.xml +++ b/theme_odoo_experts/views/snippets/s_company_team.xml @@ -8,15 +8,4 @@ - - diff --git a/theme_odoo_experts/views/snippets/s_cover.xml b/theme_odoo_experts/views/snippets/s_cover.xml index ff08e9509..fe23fb37c 100644 --- a/theme_odoo_experts/views/snippets/s_cover.xml +++ b/theme_odoo_experts/views/snippets/s_cover.xml @@ -29,15 +29,4 @@ - - diff --git a/theme_odoo_experts/views/snippets/s_media_list.xml b/theme_odoo_experts/views/snippets/s_media_list.xml index eb5740bf8..42e742d37 100644 --- a/theme_odoo_experts/views/snippets/s_media_list.xml +++ b/theme_odoo_experts/views/snippets/s_media_list.xml @@ -57,14 +57,4 @@ - diff --git a/theme_odoo_experts/views/snippets/s_numbers.xml b/theme_odoo_experts/views/snippets/s_numbers.xml index 796451b9d..c220ddb6c 100644 --- a/theme_odoo_experts/views/snippets/s_numbers.xml +++ b/theme_odoo_experts/views/snippets/s_numbers.xml @@ -22,15 +22,4 @@ - - diff --git a/theme_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml index f1120869b..7e250c62e 100644 --- a/theme_paptic/views/customizations.xml +++ b/theme_paptic/views/customizations.xml @@ -418,17 +418,6 @@ - - - - - -