summaryrefslogtreecommitdiff
path: root/addons/website_mass_mailing/views
diff options
context:
space:
mode:
authorThibault Delavallée <tde@odoo.com>2019-07-17 10:58:39 +0000
committerThibault Delavallée <tde@odoo.com>2019-07-17 15:50:33 +0000
commit772e1c0cc4e75cec971d2b4e1c820eb54872dc93 (patch)
tree30126a9fa9acabb9f75ab1d0665428180b9cc444 /addons/website_mass_mailing/views
parent2896aad34e797b6ca65a8efe3c5d71f31500a9a2 (diff)
[REF] mass_mailing: rename mail.mass_mailing.{.contact{_rel}, list{.merge}} models
PURPOSE Mass mailing is currently a bit messy. As SMS will be added as a way to notify people in mass through SMS let us take this opportunity to somehow clean this application: organization, light code cleaning, model renaming. SPECIFICATIONS Rename mail.mass_mailing.list and mail.mass_mailing.list to mailing.list and mailing.list.merge. Rename mail.mass_mailing.contact to mailing.contact. Rename mail.mailing_list.list_contact_rel to mailing.contact.subscription. Rationale : * those new names are easier to understand: mailing.list and mailing.contact are less mail-related, especially taking into account that SMS will allow to be less mail-oriented; * those names are easier to read / find / understand; * align wizard and sub-models naming with the main naming; * have a mailing as first part of namespacing; MIGRATION mail.mass_mailing.list model -> mailing.list mail.mass_mailing.list.merge model -> mailing.list.merge mail.mass_mailing.contact model -> mailing.contact mail.mass_mailing.list_contact_rel model -> mailing.contact.subscription mail_mass_mailing_contact_list_rel table -> mailing_contact_list_rel (specific case of a decorated m2m) fields updated (no column change) * mailing.list: subscription_contact_ids -> subscription_ids LINKS Task ID 2037906 Preparing task ID 1997464 (SMS addition in mass mailing) PR #34938
Diffstat (limited to 'addons/website_mass_mailing/views')
-rw-r--r--addons/website_mass_mailing/views/mailing_list_views.xml26
-rw-r--r--addons/website_mass_mailing/views/website_mass_mailing_views.xml (renamed from addons/website_mass_mailing/views/mass_mailing_view.xml)24
2 files changed, 26 insertions, 24 deletions
diff --git a/addons/website_mass_mailing/views/mailing_list_views.xml b/addons/website_mass_mailing/views/mailing_list_views.xml
new file mode 100644
index 00000000000..e5144cf63a6
--- /dev/null
+++ b/addons/website_mass_mailing/views/mailing_list_views.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+ <record id="mailing_list_view_form" model="ir.ui.view">
+ <field name="name">mailing.list.view.form.inherit.website</field>
+ <field name="model">mailing.list</field>
+ <field name="inherit_id" ref="mass_mailing.mailing_list_view_form"/>
+ <field name="arch" type="xml">
+ <xpath expr="//sheet" position="inside">
+ <notebook>
+ <page string="Website popups">
+ <field name="website_popup_ids">
+ <tree>
+ <field name="website_id"/>
+ </tree>
+ </field>
+ </page>
+ </notebook>
+ </xpath>
+ <xpath expr="//div[hasclass('oe_title')]" position="after">
+ <group>
+ <field name="toast_content"/>
+ </group>
+ </xpath>
+ </field>
+ </record>
+</odoo>
diff --git a/addons/website_mass_mailing/views/mass_mailing_view.xml b/addons/website_mass_mailing/views/website_mass_mailing_views.xml
index abfc03f8a8a..5c9a34ac6c3 100644
--- a/addons/website_mass_mailing/views/mass_mailing_view.xml
+++ b/addons/website_mass_mailing/views/website_mass_mailing_views.xml
@@ -1,29 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <record id="view_mail_mass_mailing_list_form" model="ir.ui.view">
- <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>
- <page string="Website popups">
- <field name="website_popup_ids">
- <tree>
- <field name="website_id"/>
- </tree>
- </field>
- </page>
- </notebook>
- </xpath>
- <xpath expr="//div[hasclass('oe_title')]" position="after">
- <group>
- <field name="toast_content"/>
- </group>
- </xpath>
- </field>
- </record>
-
<record id="view_mail_mass_mailing_popup_form" model="ir.ui.view">
<field name="name">website.mass_mailing.popup.form</field>
<field name="model">website.mass_mailing.popup</field>