summaryrefslogtreecommitdiff
path: root/addons/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/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/mass_mailing/views')
-rw-r--r--addons/mass_mailing/views/mailing_contact_views.xml (renamed from addons/mass_mailing/views/mass_mailing_contact_views.xml)51
-rw-r--r--addons/mass_mailing/views/mailing_list_views.xml (renamed from addons/mass_mailing/views/mass_mailing_list_views.xml)36
-rw-r--r--addons/mass_mailing/views/mass_mailing_views.xml6
3 files changed, 45 insertions, 48 deletions
diff --git a/addons/mass_mailing/views/mass_mailing_contact_views.xml b/addons/mass_mailing/views/mailing_contact_views.xml
index f474b76240c..9a0b8989628 100644
--- a/addons/mass_mailing/views/mass_mailing_contact_views.xml
+++ b/addons/mass_mailing/views/mailing_contact_views.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <!-- MAILING CONTACT -->
- <record model="ir.ui.view" id="mail_mass_mailing_list_contact_rel_view_form">
- <!--TODO DBE : To remove - Deprecated -->
- <field name="name">mail.mass_mailing.list_contact_rel.view.form</field>
- <field name="model">mail.mass_mailing.list_contact_rel</field>
+ <!-- MAILING CONTACT SUBSCRIPTION -->
+ <record model="ir.ui.view" id="mailing_contact_subscription_view_form">
+ <field name="name">mailing.contact.subscription.view.form</field>
+ <field name="model">mailing.contact.subscription</field>
<field name="priority">10</field>
<field name="arch" type="xml">
<form string="Mailing List contacts">
@@ -27,10 +26,9 @@
</field>
</record>
- <record model="ir.ui.view" id="mail_mass_mailing_list_contact_rel_list_contact_view_tree">
- <!--TODO DBE : To remove - Deprecated -->
- <field name="name">mail.mass_mailing.list_contact_rel.list_contact.view.tree</field>
- <field name="model">mail.mass_mailing.list_contact_rel</field>
+ <record model="ir.ui.view" id="mailing_contact_subscription_view_tree">
+ <field name="name">mailing.contact.subscription.view.tree</field>
+ <field name="model">mailing.contact.subscription</field>
<field name="arch" type="xml">
<tree string="Mailing Lists">
<field name="contact_id"/>
@@ -43,10 +41,9 @@
</field>
</record>
- <record model="ir.ui.view" id="mail_mass_mailing_list_contact_view_search">
- <!--TODO DBE : To remove - Deprecated -->
- <field name="name">mail.mass_mailing.list_contact_rel.view.search</field>
- <field name="model">mail.mass_mailing.list_contact_rel</field>
+ <record model="ir.ui.view" id="mailing_contact_subscription_view_search">
+ <field name="name">mailing.contact.subscription.view.search</field>
+ <field name="model">mailing.contact.subscription</field>
<field name="arch" type="xml">
<search string="Mailing List Contacts">
<field name="contact_id"/>
@@ -71,8 +68,8 @@
</record>
<record model="ir.ui.view" id="view_mail_mass_mailing_contact_search">
- <field name="name">mail.mass_mailing.contact.search</field>
- <field name="model">mail.mass_mailing.contact</field>
+ <field name="name">mailing.contact.search</field>
+ <field name="model">mailing.contact</field>
<field name="arch" type="xml">
<search string="Mailing List Contacts">
<field name="name" filter_domain="['|','|',('name','ilike',self),('company_name','ilike',self), ('email','ilike',self)]"
@@ -99,8 +96,8 @@
</record>
<record model="ir.ui.view" id="view_mail_mass_mailing_contact_tree">
- <field name="name">mail.mass_mailing.contact.tree</field>
- <field name="model">mail.mass_mailing.contact</field>
+ <field name="name">mailing.contact.tree</field>
+ <field name="model">mailing.contact</field>
<field name="priority">10</field>
<field name="arch" type="xml">
<tree string="Mailing List Contacts">
@@ -116,8 +113,8 @@
</record>
<record id="view_mail_mass_mailing_contact_kanban" model="ir.ui.view">
- <field name="name">mail.mass_mailing.contact.kanban</field>
- <field name="model">mail.mass_mailing.contact</field>
+ <field name="name">mailing.contact.kanban</field>
+ <field name="model">mailing.contact</field>
<field name="arch" type="xml">
<kanban>
<field name="name"/>
@@ -158,8 +155,8 @@
</record>
<record model="ir.ui.view" id="view_mail_mass_mailing_contact_form">
- <field name="name">mail.mass_mailing.contact.form</field>
- <field name="model">mail.mass_mailing.contact</field>
+ <field name="name">mailing.contact.form</field>
+ <field name="model">mailing.contact</field>
<field name="priority">10</field>
<field name="arch" type="xml">
<form string="Mailing List Contacts">
@@ -213,8 +210,8 @@
</record>
<record model="ir.ui.view" id="view_mail_mass_mailing_contact_pivot">
- <field name="name">mail.mass_mailing.contact.pivot</field>
- <field name="model">mail.mass_mailing.contact</field>
+ <field name="name">mailing.contact.pivot</field>
+ <field name="model">mailing.contact</field>
<field name="priority">10</field>
<field name="arch" type="xml">
<pivot string="Mailing List Contacts" stacked="True">
@@ -224,8 +221,8 @@
</record>
<record model="ir.ui.view" id="view_mail_mass_mailing_contact_graph">
- <field name="name">mail.mass_mailing.contact.graph</field>
- <field name="model">mail.mass_mailing.contact</field>
+ <field name="name">mailing.contact.graph</field>
+ <field name="model">mailing.contact</field>
<field name="priority">10</field>
<field name="arch" type="xml">
<graph string="Mailing List Contacts" stacked="True">
@@ -236,7 +233,7 @@
<record model="ir.actions.act_window" id="action_view_mass_mailing_contacts">
<field name="name">Mailing List Contacts</field>
- <field name="res_model">mail.mass_mailing.contact</field>
+ <field name="res_model">mailing.contact</field>
<field name="view_mode">tree,kanban,form,graph,pivot</field>
<field name="context">{'search_default_valid_recipient': 1}</field>
<field name="help" type="html">
@@ -250,7 +247,7 @@
<record model="ir.actions.act_window" id="action_view_mass_mailing_contacts_from_list">
<field name="name">Recipients</field>
- <field name="res_model">mail.mass_mailing.contact</field>
+ <field name="res_model">mailing.contact</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('list_ids', 'in', [active_id])]</field>
<field name="context">{'search_default_valid_recipients': 1, 'default_list_ids': [active_id]}</field>
diff --git a/addons/mass_mailing/views/mass_mailing_list_views.xml b/addons/mass_mailing/views/mailing_list_views.xml
index 3a3185f9bda..597c7b3a9ff 100644
--- a/addons/mass_mailing/views/mass_mailing_list_views.xml
+++ b/addons/mass_mailing/views/mailing_list_views.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!-- MAILING LIST -->
- <record model="ir.ui.view" id="view_mail_mass_mailing_list_search">
- <field name="name">mail.mass_mailing.list.search</field>
- <field name="model">mail.mass_mailing.list</field>
+ <record model="ir.ui.view" id="mailing_list_view_search">
+ <field name="name">mailing.list.view.search</field>
+ <field name="model">mailing.list</field>
<field name="arch" type="xml">
<search string="Mailing Lists">
<field name="name"/>
@@ -18,9 +18,9 @@
</field>
</record>
- <record model="ir.ui.view" id="view_mail_mass_mailing_list_tree">
- <field name="name">mail.mass_mailing.list.tree</field>
- <field name="model">mail.mass_mailing.list</field>
+ <record model="ir.ui.view" id="mailing_list_view_tree">
+ <field name="name">mailing.list.view.tree</field>
+ <field name="model">mailing.list</field>
<field name="priority">10</field>
<field name="arch" type="xml">
<tree string="Mailing Lists">
@@ -32,9 +32,9 @@
</field>
</record>
- <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>
+ <record model="ir.ui.view" id="mailing_list_view_form">
+ <field name="name">mailing.list.form</field>
+ <field name="model">mailing.list</field>
<field name="arch" type="xml">
<form string="Contact List">
<sheet>
@@ -60,9 +60,9 @@
</field>
</record>
- <record id="view_mail_mass_mailing_list_form_simplified" model="ir.ui.view">
- <field name="name">mail.mass_mailing.list.form.simplified</field>
- <field name="model">mail.mass_mailing.list</field>
+ <record id="mailing_list_view_form_simplified" model="ir.ui.view">
+ <field name="name">mailing.list.form.simplified</field>
+ <field name="model">mailing.list</field>
<field name="arch" type="xml">
<form string="Contact List">
<group>
@@ -88,15 +88,15 @@
<record id="open_create_mass_mailing_list" model="ir.actions.act_window">
<field name="name">Create a Mass Mailing List</field>
- <field name="res_model">mail.mass_mailing.list</field>
+ <field name="res_model">mailing.list</field>
<field name="view_mode">form</field>
- <field name="view_id" ref="view_mail_mass_mailing_list_form_simplified"/>
+ <field name="view_id" ref="mailing_list_view_form_simplified"/>
<field name="target">new</field>
</record>
- <record id="view_mail_mass_mailing_list_kanban" model="ir.ui.view">
- <field name="name">mail.mass_mailing.list.kanban</field>
- <field name="model">mail.mass_mailing.list</field>
+ <record id="mailing_list_view_kanban" model="ir.ui.view">
+ <field name="name">mailing.list.view.kanban</field>
+ <field name="model">mailing.list</field>
<field name="arch" type="xml">
<kanban js_class="mass_mailing_list_kanban" class="o_kanban_mobile" on_create="mass_mailing.open_create_mass_mailing_list">
<field name="name"/>
@@ -149,7 +149,7 @@
<record model="ir.actions.act_window" id="action_view_mass_mailing_lists">
<field name="name">Mailing Lists</field>
- <field name="res_model">mail.mass_mailing.list</field>
+ <field name="res_model">mailing.list</field>
<field name="view_mode">kanban,tree,form</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml
index 7bbf205497f..7643974d42b 100644
--- a/addons/mass_mailing/views/mass_mailing_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_views.xml
@@ -158,10 +158,10 @@
<field name="mailing_model_name" invisible="1"/>
<field name="mailing_model_real" invisible="1"/>
<field name="mailing_domain" widget="domain"
- attrs="{'invisible': [('mailing_model_name', '=', 'mail.mass_mailing.list')]}"
+ attrs="{'invisible': [('mailing_model_name', '=', 'mailing.list')]}"
options="{'model': 'mailing_model_real'}">
</field>
- <div attrs="{'invisible': [('mailing_model_name', '!=', 'mail.mass_mailing.list')]}">
+ <div attrs="{'invisible': [('mailing_model_name', '!=', 'mailing.list')]}">
<label for="contact_list_ids" string="Select mailing lists:" class="oe_edit_only"/>
<field name="contact_list_ids" widget="many2many_tags"
placeholder="Select mailing lists..." class="oe_inline"/>
@@ -187,7 +187,7 @@
<label for="reply_to"/>
<div>
<field name="reply_to_mode" widget="radio"
- attrs="{'invisible': [('mailing_model_name', 'in', ['mail.mass_mailing.contact', 'res.partner', 'mail.mass_mailing.list'])]}"/>
+ attrs="{'invisible': [('mailing_model_name', 'in', ['mailing.contact', 'res.partner', 'mailing.list'])]}"/>
<field name="reply_to"
attrs="{'required': [('reply_to_mode', '=', 'email')], 'invisible': [('reply_to_mode', '=', 'thread')]}"/>
</div>