From a5a31c7e70ef16de371b4a08539f3ff3cf155ce3 Mon Sep 17 00:00:00 2001
From: Patrick Hoste <pko@odoo.com>
Date: Tue, 9 Nov 2021 16:04:00 +0000
Subject: [PATCH] [IMP] website_mass_mailing: move mailing list option to
 parent block

PURPOSE

This commit moves the mailing list option of the editor to the parent
block to ease the configuration of a newsletter snippet.

LINKS

Task-2672194

Part-of: odoo/odoo#79582
---
 .../views/snippets_templates.xml              | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/addons/website_mass_mailing/views/snippets_templates.xml b/addons/website_mass_mailing/views/snippets_templates.xml
index 32717fb5b56..46ad954242c 100644
--- a/addons/website_mass_mailing/views/snippets_templates.xml
+++ b/addons/website_mass_mailing/views/snippets_templates.xml
@@ -80,21 +80,36 @@
 </template>
 
 <template id="newsletter_subscribe_options" name="Newsletter Subscribe Options" inherit_id="website.snippet_options">
-    <xpath expr="//div" position="after">
-        <t t-set="selector" t-value="'.js_subscribe'"/>
-        <div data-js="mailing_list_subscribe"
-            t-att-data-selector="selector">
-            <we-select string="Newsletter" data-attribute-name="listId"></we-select>
-        </div>
-        <div data-js="recaptchaSubscribe"
-            t-att-data-selector="selector">
-            <t t-set="recaptcha_public_key" t-value="request.env['ir.config_parameter'].sudo().get_param('recaptcha_public_key')"/>
-            <we-checkbox t-if="recaptcha_public_key" string="Show reCaptcha Policy" data-toggle-recaptcha-legal="" data-no-preview="true"/>
-        </div>
-        <div t-att-data-selector="selector" data-drop-near="p, h1, h2, h3, blockquote, .card"/>
+    <xpath expr="//*[@t-set='so_snippet_addition_selector']" position="inside">, .o_newsletter_popup</xpath>
+    <xpath expr="//div[last()]" position="after">
+        <t t-call="website_mass_mailing.newsletter_subscribe_options_common">
+            <t t-set="_selector">.o_newsletter_popup</t>
+            <t t-set="_target">.s_newsletter_list</t>
+        </t>
+        <t t-call="website_mass_mailing.newsletter_subscribe_options_common">
+            <t t-set="_selector">.s_newsletter_list</t>
+            <t t-set="_exclude">.s_newsletter_block .s_newsletter_list, .o_newsletter_popup .s_newsletter_list</t>
+        </t>
+        <div data-selector=".js_subscribe" data-drop-near="p, h1, h2, h3, blockquote, .card"/>
     </xpath>
 </template>
 
+<template id="newsletter_subscribe_options_common">
+    <div data-js="mailing_list_subscribe"
+         t-att-data-selector="_selector"
+         t-att-data-exclude="_exclude"
+         t-att-data-target="_target">
+        <we-select string="Newsletter" data-attribute-name="listId"></we-select>
+    </div>
+    <div data-js="recaptchaSubscribe"
+         t-att-data-selector="_selector"
+         t-att-data-exclude="_exclude"
+         t-att-data-target="_target">
+        <t t-set="recaptcha_public_key" t-value="request.env['ir.config_parameter'].sudo().get_param('recaptcha_public_key')"/>
+        <we-checkbox t-if="recaptcha_public_key" string="Show reCaptcha Policy" data-toggle-recaptcha-legal="" data-no-preview="true"/>
+    </div>
+</template>
+
 <!-- Extend default mass_mailing snippets with website feature -->
 
 <template id="s_mail_block_footer_social" inherit_id="mass_mailing.s_mail_block_footer_social">