[FIX] mass_mailing, website_mass_mailing: "group_website_popup_on_exit" group

This group was defined in the mass_mailing module but is only working when
you install website_mass_mailing. What this group does is allowing to insert
a newsletter snippet in the page, thus it has nothing to do in the mass_mailing
module which doesn't depend on website. Also, the snippet itself was already
defined in website_mass_mailing.

Moved all the things to website_mass_mailing.

14 files changed, 90 insertions, 35 deletions

diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 3b3160cc3d4..9bf1a913b20 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -30,23 +30,10 @@ class MassMailingList(models.Model):
     _order = 'name'
     _description = 'Mailing List'
 
-    def _default_popup_content(self):
-        return """<div class="modal-header text-center">
-    <h3 class="modal-title mt8">Odoo Presents</h3>
-</div>
-<div class="o_popup_message">
-    <font>7</font>
-    <strong>Business Hacks</strong>
-    <span> to<br/>boost your marketing</span>
-</div>
-<p class="o_message_paragraph">Join our Marketing newsletter and get <strong>this white paper instantly</strong></p>"""
-
     name = fields.Char(string='Mailing List', required=True)
     active = fields.Boolean(default=True)
     create_date = fields.Datetime(string='Creation Date')
     contact_nbr = fields.Integer(compute="_compute_contact_nbr", string='Number of Contacts')
-    popup_content = fields.Html(string="Website Popup Content", translate=True, sanitize=False, default=_default_popup_content)
-    popup_redirect_url = fields.Char(string="Website Popup Redirect URL", default='/')
 
     def _compute_contact_nbr(self):
         contacts_data = self.env['mail.mass_mailing.contact'].read_group([('list_id', 'in', self.ids), ('opt_out', '!=', True)], ['list_id'], ['list_id'])
diff --git a/addons/mass_mailing/models/res_config.py b/addons/mass_mailing/models/res_config.py
index 87a03e45d0b..8ab79b8b2fd 100644
--- a/addons/mass_mailing/models/res_config.py
+++ b/addons/mass_mailing/models/res_config.py
@@ -13,9 +13,4 @@ class MassMailingConfiguration(models.TransientModel):
         (1, "Allow using marketing campaigns (advanced)")], string="Campaigns",
         implied_group='mass_mailing.group_mass_mailing_campaign',
         help="""Manage mass mailign using Campaigns""")
-    group_website_popup_on_exit = fields.Selection([
-        (0, 'Do not add extra content on website pages to encourage visitors to sign up'),
-        (1, 'Allow the use of a pop-up snippet on website to encourage visitors to sign up on a mass mailing list')
-        ], string="Website Pop-up",
-        implied_group="mass_mailing.group_website_popup_on_exit")
     module_mass_mailing_themes = fields.Boolean("Mass mailing themes")
diff --git a/addons/mass_mailing/security/mass_mailing_security.xml b/addons/mass_mailing/security/mass_mailing_security.xml
index 03b56240312..823a9a4f4b5 100644
--- a/addons/mass_mailing/security/mass_mailing_security.xml
+++ b/addons/mass_mailing/security/mass_mailing_security.xml
@@ -6,12 +6,6 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
-    
-
-    <record id="group_website_popup_on_exit" model="res.groups">
-        <field name="name">Use subscription pop up on the website</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
 
     <!-- Group to manage campaigns -->
     <record id="group_mass_mailing_campaign" model="res.groups">
diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml
index c872fb22495..e3670ba18ea 100644
--- a/addons/mass_mailing/views/mass_mailing_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_views.xml
@@ -154,15 +154,7 @@
                             <h1>
                                 <field name="name" placeholder="e.g. Consumer Newsletter"/>
                             </h1>
-                            <group groups="mass_mailing.group_website_popup_on_exit">
-                                <field name="popup_redirect_url"/>
-                            </group>
                         </div>
-                        <notebook groups="mass_mailing.group_website_popup_on_exit">
-                            <page string="Popup Content">
-                                <field name="popup_content" widget="html_frame" options="{'editor_url': '/website_mass_mailing/field/popup_content'}"/>
-                            </page>
-                        </notebook>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/mass_mailing/views/res_config_views.xml b/addons/mass_mailing/views/res_config_views.xml
index 7b1744a1465..f6ef49c620a 100644
--- a/addons/mass_mailing/views/res_config_views.xml
+++ b/addons/mass_mailing/views/res_config_views.xml
@@ -9,7 +9,7 @@
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <group string="Mass Mailing">
+                    <group string="Mass Mailing" name="mass_mailing_group">
                         <field name="group_mass_mailing_campaign" widget="radio"/>
                         <label for="module_mass_mailing_themes" string="Mass mailing themes"/>
                         <div>
@@ -17,7 +17,6 @@
                             <label for="module_mass_mailing_themes" invisible="1"/>
                             <a href="https://www.odoo.com/page/email-marketing" target="_blank"> More Info </a>
                         </div>
-                        <field name="group_website_popup_on_exit" widget="radio"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/website_mass_mailing/__init__.py b/addons/website_mass_mailing/__init__.py
index dd15b5c32e5..7d34c7c054a 100644
--- a/addons/website_mass_mailing/__init__.py
+++ b/addons/website_mass_mailing/__init__.py
@@ -2,3 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import controllers
+from . import models
diff --git a/addons/website_mass_mailing/__openerp__.py b/addons/website_mass_mailing/__openerp__.py
index 6c044f24003..ec9fa4278dc 100644
--- a/addons/website_mass_mailing/__openerp__.py
+++ b/addons/website_mass_mailing/__openerp__.py
@@ -10,9 +10,12 @@ Add a snippet in the website builder to subscribe a mass_mailing list
     'category': 'Marketing',
     'depends': ['website', 'mass_mailing'],
     'data': [
+        'security/mass_mailing_security.xml',
         'views/website_mass_mailing_templates.xml',
         'views/unsubscribe_templates.xml',
         'views/snippets_templates.xml',
+        'views/mass_mailing_view.xml',
+        'views/res_config_view.xml',
     ],
     'auto_install': True,
 }
diff --git a/addons/website_mass_mailing/models/__init__.py b/addons/website_mass_mailing/models/__init__.py
new file mode 100644
index 00000000000..5e5b7affad2
--- /dev/null
+++ b/addons/website_mass_mailing/models/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import mass_mailing_list
+from . import res_config
diff --git a/addons/website_mass_mailing/models/mass_mailing_list.py b/addons/website_mass_mailing/models/mass_mailing_list.py
new file mode 100644
index 00000000000..7058e385b05
--- /dev/null
+++ b/addons/website_mass_mailing/models/mass_mailing_list.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class MassMailingList(models.Model):
+    _inherit = 'mail.mass_mailing.list'
+
+    def _default_popup_content(self):
+        return """<div class="modal-header text-center">
+    <h3 class="modal-title mt8">Odoo Presents</h3>
+</div>
+<div class="o_popup_message">
+    <font>7</font>
+    <strong>Business Hacks</strong>
+    <span> to<br/>boost your marketing</span>
+</div>
+<p class="o_message_paragraph">Join our Marketing newsletter and get <strong>this white paper instantly</strong></p>"""
+
+    popup_content = fields.Html(string="Website Popup Content", translate=True, sanitize=False,
+                                default=_default_popup_content)
+    popup_redirect_url = fields.Char(string="Website Popup Redirect URL", default='/')
diff --git a/addons/website_mass_mailing/models/res_config.py b/addons/website_mass_mailing/models/res_config.py
new file mode 100644
index 00000000000..f30da75f8e0
--- /dev/null
+++ b/addons/website_mass_mailing/models/res_config.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class MassMailingConfiguration(models.TransientModel):
+    _inherit = 'mass.mailing.config.settings'
+
+    group_website_popup_on_exit = fields.Selection([
+        (0, 'Do not add extra content on website pages to encourage visitors to sign up'),
+        (1, 'Allow the use of a pop-up snippet on website to encourage visitors to sign up on a mass mailing list')
+    ], string="Website Pop-up",
+        implied_group="website_mass_mailing.group_website_popup_on_exit")
diff --git a/addons/website_mass_mailing/security/mass_mailing_security.xml b/addons/website_mass_mailing/security/mass_mailing_security.xml
new file mode 100644
index 00000000000..1f1438fcab3
--- /dev/null
+++ b/addons/website_mass_mailing/security/mass_mailing_security.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="group_website_popup_on_exit" model="res.groups">
+        <field name="name">Use subscription pop up on the website</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+</odoo>
diff --git a/addons/website_mass_mailing/views/mass_mailing_view.xml b/addons/website_mass_mailing/views/mass_mailing_view.xml
new file mode 100644
index 00000000000..01bd8c7989d
--- /dev/null
+++ b/addons/website_mass_mailing/views/mass_mailing_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record model="ir.ui.view" id="view_mail_mass_mailing_list_form">
+        <field name="name">mail.mass_mailing.list.form</field>
+        <field name="model">mail.mass_mailing.list</field>
+        <field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_list_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//sheet" position="inside">
+                <notebook groups="website_mass_mailing.group_website_popup_on_exit">
+                    <page string="Popup Content">
+                        <field name="popup_content" widget="html_frame" options="{'editor_url': '/website_mass_mailing/field/popup_content'}"/>
+                    </page>
+                </notebook>
+            </xpath>
+            <xpath expr="//div[@class='oe_title']" position="inside">
+                <group groups="website_mass_mailing.group_website_popup_on_exit">
+                    <field name="popup_redirect_url"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/website_mass_mailing/views/res_config_view.xml b/addons/website_mass_mailing/views/res_config_view.xml
new file mode 100644
index 00000000000..752a8f86d8f
--- /dev/null
+++ b/addons/website_mass_mailing/views/res_config_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="inherited_view_mass_mailing_configuration" model="ir.ui.view">
+        <field name="inherit_id" ref="mass_mailing.view_mass_mailing_configuration"/>
+        <field name="name">mass.mailing.config.settings.inherit</field>
+        <field name="model">mass.mailing.config.settings</field>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='mass_mailing_group']" position="inside">
+                <field name="group_website_popup_on_exit" widget="radio"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/website_mass_mailing/views/snippets_templates.xml b/addons/website_mass_mailing/views/snippets_templates.xml
index 6f7ff554f99..d264a5398e3 100644
--- a/addons/website_mass_mailing/views/snippets_templates.xml
+++ b/addons/website_mass_mailing/views/snippets_templates.xml
@@ -38,7 +38,7 @@
 
 <template id="website_popup_snippet" name="popup snippet" inherit_id="website.snippets">
     <xpath expr="//div[@id='snippet_feature']/div[@class='o_panel_body']" position="inside">
-        <div groups="mass_mailing.group_website_popup_on_exit">
+        <div groups="website_mass_mailing.group_website_popup_on_exit">
             <div class="oe_snippet_thumbnail">
                 <img class="oe_snippet_thumbnail_img" src="/mass_mailing/static/src/img/blocks/bounce.png" />
                 <span class="oe_snippet_thumbnail_title">Newsletter Popup</span>