From 57e63ad29051c6dce271f88c20d487ffb6a6dec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Mottet=20=28oms=29?= <oms@odoo.com>
Date: Thu, 2 Sep 2021 14:57:48 +0000
Subject: [PATCH] [FIX] theme_*: fix masonry xpath

*: vehicle, yes, zap

Commit [1] modified the website.s_masonry_block template and makes it
call website.s_masonry_block_default_template. The theme custo xpaths
should now be done in that template instead.

[1]: https://github.com/odoo/odoo/commit/c90ab7b6646b603dcd0a49387b5eeba60ce17f59

closes odoo/design-themes#493

Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
---
 theme_vehicle/views/customizations.xml       | 2 +-
 theme_yes/views/snippets/s_masonry_block.xml | 2 +-
 theme_zap/views/snippets/s_masonry_block.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/theme_vehicle/views/customizations.xml b/theme_vehicle/views/customizations.xml
index a8401fb31..c36f4c8ea 100644
--- a/theme_vehicle/views/customizations.xml
+++ b/theme_vehicle/views/customizations.xml
@@ -70,7 +70,7 @@
 </template>
 
 <!-- ======== MASONERY BLOCK ======== -->
-<template id="s_masonry_block" inherit_id="website.s_masonry_block" name="Vehicle s_masonry_block">
+<template id="s_masonry_block_default_template" inherit_id="website.s_masonry_block_default_template" name="Vehicle s_masonry_block">
     <xpath expr="//p" position="replace"/>
 
     <xpath expr="//div[hasclass('h-100')]/div//h3" position="replace">
diff --git a/theme_yes/views/snippets/s_masonry_block.xml b/theme_yes/views/snippets/s_masonry_block.xml
index 2bdc46a13..f6bf7dec9 100644
--- a/theme_yes/views/snippets/s_masonry_block.xml
+++ b/theme_yes/views/snippets/s_masonry_block.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_masonry_block" inherit_id="website.s_masonry_block">
+    <template id="s_masonry_block_default_template" inherit_id="website.s_masonry_block_default_template">
         <!-- Column 1 -->
         <xpath expr="(//div[hasclass('col-lg-6')])[3]" position="replace">
             <div class="col-lg-6 o_cc o_cc4 text-center">
diff --git a/theme_zap/views/snippets/s_masonry_block.xml b/theme_zap/views/snippets/s_masonry_block.xml
index 29424eb1d..86e656082 100644
--- a/theme_zap/views/snippets/s_masonry_block.xml
+++ b/theme_zap/views/snippets/s_masonry_block.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_masonry_block" inherit_id="website.s_masonry_block">
+    <template id="s_masonry_block_default_template" inherit_id="website.s_masonry_block_default_template">
         <!-- Block #01 -->
         <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')]/*" position="before">
             <i class="fa fa-star fa-1x text-secondary rounded shadow-sm mx-auto mb-3"/>