Skip to content

Commit aed6d05

Browse files
bso-odoobso-odoo
committed
[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]: d206c11 [2]: odoo/odoo@928eeca#diff-f49a1e9eda23df9f1d48121ba376a5fabafe70ea18b29d4eab23d737e5d4eeb6R446 closes #752 X-original-commit: 7b27828 Related: odoo/odoo#144666 Signed-off-by: Romain Derie (rde) <[email protected]>
1 parent 9592392 commit aed6d05

File tree

22 files changed

+0
-262
lines changed

22 files changed

+0
-262
lines changed

‎theme_anelusia/views/snippets/s_comparisons.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,4 @@
2929
</xpath>
3030
</template>
3131

32-
<template id="configurator_s_comparisons" inherit_id="website.configurator_s_comparisons">
33-
<!-- Shape option -->
34-
<xpath expr="//section" position="attributes">
35-
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/17","flip":[]}</attribute>
36-
</xpath>
37-
<!-- Shape -->
38-
<xpath expr="//div[hasclass('container')]" position="before">
39-
<div class="o_we_shape o_web_editor_Origins_17"/>
40-
</xpath>
41-
</template>
42-
4332
</odoo>

‎theme_artists/views/snippets/s_image_text.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,4 @@
2727
</xpath>
2828
</template>
2929

30-
<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text">
31-
<!-- Shape option -->
32-
<xpath expr="//section" position="attributes">
33-
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/05","flip":[]}</attribute>
34-
</xpath>
35-
<!-- Shape -->
36-
<xpath expr="//div[hasclass('container')]" position="before">
37-
<div class="o_we_shape o_web_editor_Wavy_05"/>
38-
</xpath>
39-
</template>
40-
4130
</odoo>

‎theme_artists/views/snippets/s_numbers.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,4 @@
88
</xpath>
99
</template>
1010

11-
<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
12-
<!-- Shape option -->
13-
<xpath expr="//section" position="attributes">
14-
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["x"]}</attribute>
15-
</xpath>
16-
<!-- Shape -->
17-
<xpath expr="//div[hasclass('container')]" position="before">
18-
<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%;"/>
19-
</xpath>
20-
</template>
21-
2211
</odoo>

‎theme_artists/views/snippets/s_parallax.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,4 @@
88
</xpath>
99
</template>
1010

11-
<template id="configurator_s_parallax" inherit_id="website.configurator_s_parallax">
12-
<!-- Shape option -->
13-
<xpath expr="//section" position="attributes">
14-
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
15-
</xpath>
16-
<!-- Shape -->
17-
<xpath expr="//section/*[last()]" position="before">
18-
<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%;"/>
19-
</xpath>
20-
</template>
21-
2211
</odoo>

‎theme_artists/views/snippets/s_product_catalog.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,4 @@
99
</xpath>
1010
</template>
1111

12-
<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
13-
<!-- Shape option -->
14-
<xpath expr="//section" position="attributes">
15-
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":[]}</attribute>
16-
</xpath>
17-
<!-- Shape -->
18-
<xpath expr="//div[hasclass('container')]" position="before">
19-
<div class="o_we_shape o_web_editor_Wavy_08"/>
20-
</xpath>
21-
</template>
22-
2312
</odoo>

‎theme_artists/views/snippets/s_quotes_carousel.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,4 @@
2828
</xpath>
2929
</template>
3030

31-
<template id="configurator_s_quotes_carousel" inherit_id="website.configurator_s_quotes_carousel">
32-
<!-- Shape option -->
33-
<xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
34-
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/09","flip":[]}</attribute>
35-
</xpath>
36-
<!-- Shape -->
37-
<xpath expr="//ol[hasclass('carousel-indicators')]" position="before">
38-
<div class="o_we_shape o_web_editor_Wavy_09"/>
39-
</xpath>
40-
</template>
41-
4231
</odoo>

‎theme_bewise/views/customizations.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -244,15 +244,6 @@
244244
</xpath>
245245
</template>
246246

247-
<template id="configurator_s_company_team" inherit_id="website.configurator_s_company_team" name="Be Wise s_company_team">
248-
<xpath expr="//section" position="attributes">
249-
<attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/09","flip":[]}</attribute>
250-
</xpath>
251-
<xpath expr="//section/div" position="before">
252-
<div class="o_we_shape o_web_editor_Blobs_09"/>
253-
</xpath>
254-
</template>
255-
256247
<!-- ======== BIG BOXES ======== -->
257248
<template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2" name="Be Wise s_color_blocks_2">
258249
<!-- Left column -->

‎theme_bistro/views/snippets/s_banner.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,4 @@
1212
</xpath>
1313
</template>
1414

15-
<template id="configurator_s_banner" inherit_id="website.configurator_s_banner">
16-
<!-- Shape option -->
17-
<xpath expr="section" position="attributes">
18-
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/09_001","flip":["x"]}</attribute>
19-
</xpath>
20-
<xpath expr="//*[hasclass('container')]" position="before">
21-
<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%;"/>
22-
</xpath>
23-
</template>
24-
2515
</odoo>

‎theme_bookstore/views/snippets/s_product_catalog.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,4 @@
1212
</xpath>
1313
</template>
1414

15-
<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
16-
<!-- Shape option -->
17-
<xpath expr="//section" position="attributes">
18-
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/17","flip":["y"]}</attribute>
19-
</xpath>
20-
<!-- Shape -->
21-
<xpath expr="//section/*" position="before">
22-
<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%;"/>
23-
</xpath>
24-
</template>
25-
2615
</odoo>

‎theme_buzzy/views/snippets/s_title.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,4 @@
1212
</xpath>
1313
</template>
1414

15-
<template id="configurator_s_title" inherit_id="website.configurator_s_title">
16-
<!-- Shape option -->
17-
<xpath expr="//section" position="attributes">
18-
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_001","flip":[]}</attribute>
19-
</xpath>
20-
<!-- Shape -->
21-
<xpath expr="//section/*" position="before">
22-
<div class="o_we_shape o_web_editor_Airy_13_001"/>
23-
</xpath>
24-
</template>
25-
2615
</odoo>

0 commit comments

Comments
 (0)