From ed86434a19dcbe999accd4ce3f63a72b8a04d310 Mon Sep 17 00:00:00 2001
From: Geoffroy Larue <gla@odoo.com>
Date: Wed, 7 Nov 2018 15:50:46 +0000
Subject: [PATCH] [IMP] mass_mailing: improve onboarding

Purpose : this commit improve various elements of the mass mailing interface :
- make recipients field in mass mailing form required and add "mass mailing contact" in selection
- new "Archive" button and color picker in dropdown menus of mailing lists and mailings
kanban views.
- various little improvements in labels

closes odoo/odoo#28497
---
 addons/mail/views/mail_blacklist_views.xml    |  2 +-
 addons/mass_mailing/models/mass_mailing.py    |  1 +
 .../mass_mailing/views/mass_mailing_views.xml | 23 ++++++++++++++-----
 .../wizard/test_mailing_views.xml             |  2 +-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/addons/mail/views/mail_blacklist_views.xml b/addons/mail/views/mail_blacklist_views.xml
index dca1dfec55c..3be2e0524ed 100644
--- a/addons/mail/views/mail_blacklist_views.xml
+++ b/addons/mail/views/mail_blacklist_views.xml
@@ -60,7 +60,7 @@
           <p class="o_view_nocontent_smiling_face">
             Add an email address in the blacklist
           </p><p>
-            Email addresses that are blacklisted means that the recipient won't receive any mass mailing anymore.
+            Email addresses that are blacklisted means that the recipient won't receive mass mailing anymore.
         </p>
         </field>
     </record>
diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 643c03db195..48d5c6704d9 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -23,6 +23,7 @@ MASS_MAILING_BUSINESS_MODELS = [
     'event.track',
     'sale.order',
     'mail.mass_mailing.list',
+    'mail.mass_mailing.contact'
 ]
 EMAIL_PATTERN = '([^ ,;<@]+@[^> ,;]+)'
 
diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml
index 97956b7ee85..388f5078396 100644
--- a/addons/mass_mailing/views/mass_mailing_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_views.xml
@@ -372,6 +372,7 @@
                 <kanban class="o_kanban_mobile" on_create="mass_mailing.open_create_mass_mailing_list">
                     <field name="name"/>
                     <field name="contact_nbr"/>
+                    <field name="active"/>
                     <templates>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_global_click">
@@ -391,6 +392,11 @@
                                             <div class="dropdown-menu" role="menu">
                                                 <a t-if="widget.editable" role="menuitem" type="edit" class="dropdown-item">Edit</a>
                                                 <a t-if="widget.deletable" role="menuitem" type="delete" class="dropdown-item">Delete</a>
+                                                <a role="menuitem" class="dropdown-item o_kanban_mailing_active" name="toggle_active" type="object">
+                                                    <t t-if="record.active.raw_value">Archive</t>
+                                                    <t t-if="!record.active.raw_value">Restore</t>
+                                                </a>
+                                                <ul class="oe_kanban_colorpicker" data-field="color"/>
                                             </div>
                                         </div>
                                     </div>
@@ -422,7 +428,7 @@
                 Create a new mailing list
               </p><p>
                 No need of importing your mailing lists, you can easily
-                send emails to any contact saved in other Odoo apps.
+                send emails<br/> to any contact saved in other Odoo apps.
               </p>
             </field>
         </record>
@@ -591,7 +597,7 @@
                             </div>
                             <label for="mailing_model_id" string="Recipients"/>
                             <div>
-                                <field name="mailing_model_id" widget="selection"/>
+                                <field name="mailing_model_id" widget="selection" required="1"/>
                                 <field name="mailing_model_name" invisible="1"/>
                                 <field name="mailing_model_real" invisible="1"/>
                                 <field name="mailing_domain" widget="domain"
@@ -665,6 +671,7 @@
                     <field name='expected'/>
                     <field name='failed'/>
                     <field name='sent_date'/>
+                    <field name='active'/>
                     <templates>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_mass_mailing">
@@ -677,6 +684,10 @@
                                         <t t-if="widget.deletable">
                                             <a role="menuitem" type="delete" class="dropdown-item">Delete</a>
                                         </t>
+                                        <a role="menuitem" class="dropdown-item o_kanban_mailing_active" name="toggle_active" type="object">
+                                            <t t-if="record.active.raw_value">Archive</t>
+                                            <t t-if="!record.active.raw_value">Restore</t>
+                                        </a>
                                     </div>
                                 </div>
                                  <div class="oe_kanban_content">
@@ -758,7 +769,7 @@
                 Create a new mailing
               </p><p>
                 No need of importing your mailing lists, you can easily
-                send emails to any contact saved in other Odoo apps.
+                send emails<br/> to any contact saved in other Odoo apps.
               </p>
             </field>
         </record>
@@ -780,7 +791,7 @@
                 Create a new mailing
               </p><p>
                 No need of importing your mailing lists, you can easily
-                send emails to any contact saved in other Odoo apps.
+                send emails<br/> to any contact saved in other Odoo apps.
               </p>
             </field>
         </record>
@@ -802,7 +813,7 @@
                 Create a new mailing
               </p><p>
                 No need of importing your mailing lists, you can easily
-                send emails to any contact saved in other Odoo apps.
+                send emails<br/> to any contact saved in other Odoo apps.
               </p>
             </field>
         </record>
@@ -825,7 +836,7 @@
                 Create a new mailing
               </p><p>
                 No need of importing your mailing lists, you can easily
-                send emails to any contact saved in other Odoo apps.
+                send emails<br/> to any contact saved in other Odoo apps.
               </p>
             </field>
         </record>
diff --git a/addons/mass_mailing/wizard/test_mailing_views.xml b/addons/mass_mailing/wizard/test_mailing_views.xml
index b8d9640a88c..84d0025d02b 100644
--- a/addons/mass_mailing/wizard/test_mailing_views.xml
+++ b/addons/mass_mailing/wizard/test_mailing_views.xml
@@ -7,7 +7,7 @@
             <field name="arch" type="xml">
                 <form string="Send a Sample Mail">
                     <p class="text-muted">
-                        Send a sample of this mailing to the above of email addresses for test purpose.
+                        Send a sample email for testing purpose to the address below.
                     </p>
                     <group>
                         <field name="email_to"/>