[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: 7b27828755
Related: odoo/odoo#144666
Signed-off-by: Romain Derie (rde) <rde@odoo.com>
This commit is contained in:
Benoit Socias
2023-11-29 13:50:59 +01:00
parent 9592392158
commit aed6d0585b
22 changed files with 0 additions and 262 deletions
@@ -29,15 +29,4 @@
</xpath>
</template>
<template id="configurator_s_comparisons" inherit_id="website.configurator_s_comparisons">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/17","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Origins_17"/>
</xpath>
</template>
</odoo>
@@ -27,15 +27,4 @@
</xpath>
</template>
<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/05","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_05"/>
</xpath>
</template>
</odoo>
@@ -8,15 +8,4 @@
</xpath>
</template>
<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_12_001" style="background-image: url('/web_editor/shape/web_editor/Airy/12_001.svg?c1=o-color-1&amp;c3=o-color-5&amp;flip=x'); background-position: 50% 0%;"/>
</xpath>
</template>
</odoo>
@@ -8,15 +8,4 @@
</xpath>
</template>
<template id="configurator_s_parallax" inherit_id="website.configurator_s_parallax">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//section/*[last()]" position="before">
<div class="o_we_shape o_web_editor_Airy_12_001" style="background-image: url('/web_editor/shape/web_editor/Airy/12_001.svg?c1=o-color-1&amp;c3=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
</xpath>
</template>
</odoo>
@@ -9,15 +9,4 @@
</xpath>
</template>
<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_08"/>
</xpath>
</template>
</odoo>
@@ -28,15 +28,4 @@
</xpath>
</template>
<template id="configurator_s_quotes_carousel" inherit_id="website.configurator_s_quotes_carousel">
<!-- Shape option -->
<xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/09","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//ol[hasclass('carousel-indicators')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_09"/>
</xpath>
</template>
</odoo>
-9
View File
@@ -244,15 +244,6 @@
</xpath>
</template>
<template id="configurator_s_company_team" inherit_id="website.configurator_s_company_team" name="Be Wise s_company_team">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/09","flip":[]}</attribute>
</xpath>
<xpath expr="//section/div" position="before">
<div class="o_we_shape o_web_editor_Blobs_09"/>
</xpath>
</template>
<!-- ======== BIG BOXES ======== -->
<template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2" name="Be Wise s_color_blocks_2">
<!-- Left column -->
-10
View File
@@ -12,14 +12,4 @@
</xpath>
</template>
<template id="configurator_s_banner" inherit_id="website.configurator_s_banner">
<!-- Shape option -->
<xpath expr="section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/09_001","flip":["x"]}</attribute>
</xpath>
<xpath expr="//*[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Origins_09_001" style="background-image: url('/web_editor/shape/web_editor/Origins/09_001.svg?c3=o-color-2&amp;flip=x'); background-position: 50% 0%;"/>
</xpath>
</template>
</odoo>
@@ -12,15 +12,4 @@
</xpath>
</template>
<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/17","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//section/*" position="before">
<div class="o_we_shape o_web_editor_Origins_17" style="background-image: url('/web_editor/shape/web_editor/Origins/17.svg?c3=o-color-5&amp;flip=y'); background-position: 50% 50%;"/>
</xpath>
</template>
</odoo>
-11
View File
@@ -12,15 +12,4 @@
</xpath>
</template>
<template id="configurator_s_title" inherit_id="website.configurator_s_title">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//section/*" position="before">
<div class="o_we_shape o_web_editor_Airy_13_001"/>
</xpath>
</template>
</odoo>
@@ -16,15 +16,4 @@
</xpath>
</template>
<template id="configurator_s_comparisons" inherit_id="website.configurator_s_comparisons">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/05","flip":["y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Wavy_05" style="background-image: url('/web_editor/shape/web_editor/Wavy/05.svg?c1=o-color-1&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
</xpath>
</template>
</odoo>
-27
View File
@@ -80,15 +80,6 @@
<xpath expr="//a[hasclass('btn')]" position="replace"/>
</template>
<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text" name="Cobalt s_image_text">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/03","flip":[]}</attribute>
</xpath>
<xpath expr="//section/div" position="before">
<div class="o_we_shape o_web_editor_Blobs_03"/>
</xpath>
</template>
<!-- ==== Text-Image ===== -->
<template id="s_text_image" inherit_id="website.s_text_image" name="Cobalt s_text_image">
<!-- Section -->
@@ -168,15 +159,6 @@
</xpath>
</template>
<template id="configurator_s_three_columns" inherit_id="website.configurator_s_three_columns" name="Cobalt s_three_columns">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":["x"]}</attribute>
</xpath>
<xpath expr="//section/div" position="before">
<div class="o_we_shape o_web_editor_Bold_01" style="background-image: url('/web_editor/shape/web_editor/Bold/01.svg?c2=o-color-3&amp;flip=x'); background-position: 50% 0%;"/>
</xpath>
</template>
<!-- ==== Call To Action ===== -->
<template id="s_call_to_action" inherit_id="website.s_call_to_action" name="Cobalt s_call_to_action">
<xpath expr="//t[@t-esc='cta_btn_text']" position="replace" mode="inner">
@@ -200,15 +182,6 @@
</xpath>
</template>
<template id="configurator_s_picture" inherit_id="website.configurator_s_picture" name="Cobalt s_picture">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":["y"]}</attribute>
</xpath>
<xpath expr="//section/div" position="before">
<div class="o_we_shape o_web_editor_Bold_01" style="background-image: url('/web_editor/shape/web_editor/Bold/01.svg?c2=o-color-3&amp;flip=y'); background-position: 50% 100%;"></div>
</xpath>
</template>
<!-- ==== Images Gallery ===== -->
<template id="s_image_gallery" inherit_id="website.s_image_gallery">
<!-- Section -->
-9
View File
@@ -160,15 +160,6 @@
</xpath>
</template>
<template id="configurator_s_company_team" inherit_id="website.configurator_s_company_team" name="Graphene s_company_team">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/05","flip":[]}</attribute>
</xpath>
<xpath expr="//section/div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Origins_05"/>
</xpath>
</template>
<!-- ======== 3 COLUMNS ======== -->
<template id="s_three_columns" inherit_id="website.s_three_columns" name="Graphene s_three_columns">
<xpath expr="//div[hasclass('row')]/div//h3[1]" position="replace">
-11
View File
@@ -8,15 +8,4 @@
</xpath>
</template>
<template id="configurator_s_references" inherit_id="website.configurator_s_references">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Origins_14_001"/>
</xpath>
</template>
</odoo>
-12
View File
@@ -24,16 +24,4 @@
</xpath>
</template>
<template id="configurator_s_picture" inherit_id="website.configurator_s_picture">
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Origins_16" style="background-image: url('/web_editor/shape/web_editor/Origins/16.svg?c3=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
</xpath>
</template>
</odoo>
-11
View File
@@ -8,15 +8,4 @@
</xpath>
</template>
<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_12"/>
</xpath>
</template>
</odoo>
@@ -8,15 +8,4 @@
</xpath>
</template>
<template id="configurator_s_company_team" inherit_id="website.configurator_s_company_team">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Origins_02_001 o_third_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Origins/02_001.svg?c4=o-color-3&amp;c5=o-color-4&amp;flip=x'); background-position: 50% 100%;"/>
</xpath>
</template>
</odoo>
@@ -29,15 +29,4 @@
</xpath>
</template>
<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Origins_02_001"/>
</xpath>
</template>
</odoo>
@@ -57,14 +57,4 @@
<xpath expr="(//div[hasclass('s_media_list_body')])[3]//a" position="replace"/>
</template>
<template id="configurator_s_media_list" inherit_id="website.configurator_s_media_list">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/09_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Origins_09_001"/>
</xpath>
</template>
</odoo>
@@ -22,15 +22,4 @@
</xpath>
</template>
<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Origins_16"/>
</xpath>
</template>
</odoo>
-11
View File
@@ -418,17 +418,6 @@
</xpath>
</template>
<template id="configurator_s_media_list" inherit_id="website.configurator_s_media_list" name="Paptic s_media_list">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/07_002","flip":["x"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('o_container_small')]" position="before">
<div class="o_we_shape o_web_editor_Origins_07_002" style="background-image: url('/web_editor/shape/web_editor/Origins/07_002.svg?c3=o-color-4&amp;c4=o-color-2&amp;c5=o-color-4&amp;flip=x'); background-position: 50% 50%;"/>
</xpath>
</template>
<!-- ==== Features Grid ===== -->
<template id="s_features_grid" inherit_id="website.s_features_grid" name="Paptic s_features_grid">
<!-- Icon #4 -->
-20
View File
@@ -77,17 +77,6 @@
</xpath>
</template>
<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/09_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Rainy_09_001"/>
</xpath>
</template>
<!-- ======== MASONRY BLOCK ======== -->
<template id="s_masonry_block" inherit_id="website.s_masonry_block">
<xpath expr="//t[@t-call]" position="attributes">
@@ -125,15 +114,6 @@
<xpath expr="//p" position="replace"/>
</template>
<template id="configurator_s_references" inherit_id="website.configurator_s_references" name="Vehicle s_references">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/05","flip":[]}</attribute>
</xpath>
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Origins_05"/>
</xpath>
</template>
<!-- ======== CALL TO ACTION ======== -->
<template id="s_call_to_action" inherit_id="website.s_call_to_action" name="Vehicle s_call_to_action">
<!-- Section -->