From abc212f59a51d7b1de99201d5bb07c871021e766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 10 Oct 2018 13:29:03 +0000
Subject: [PATCH] [REF] mail: remove create_user_id field on activity

As activities are created using the current user there is no need anymore to
have another field to store the activity creator. We can therefore remove
create_user_id and replace its use by the magic create_uid field.

This commit is linked to task ID 1856417 and PR #27619.
---
 addons/crm/data/crm_lead_demo.xml             | 24 +++++++++----------
 .../data/hr_recruitment_demo.xml              | 14 +++++------
 addons/mail/data/mail_data.xml                |  2 +-
 addons/mail/models/mail_activity.py           |  4 ----
 addons/mail/security/mail_security.xml        |  2 +-
 addons/mail/static/src/xml/activity.xml       |  8 +++----
 addons/mail/static/tests/chatter_tests.js     | 19 +++++++--------
 addons/mail/views/mail_activity_views.xml     |  2 +-
 addons/test_mail/tests/test_mail_activity.py  |  4 ++--
 9 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/addons/crm/data/crm_lead_demo.xml b/addons/crm/data/crm_lead_demo.xml
index 6f3191d39fb..4f638a42f0e 100644
--- a/addons/crm/data/crm_lead_demo.xml
+++ b/addons/crm/data/crm_lead_demo.xml
@@ -1176,7 +1176,7 @@ Andrew</p>]]></field>
             <field name="activity_type_id" ref="mail.mail_activity_data_call" />
             <field name="summary">Meeting to go over pricing information.</field>
             <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=3)).strftime('%Y-%m-%d %H:%M')"/>
-            <field name="create_user_id" ref="base.user_admin"/>
+            <field name="create_uid" ref="base.user_admin"/>
             <field name="user_id" ref="base.user_admin"/>
         </record>
         <record id="activity_2" model="mail.activity">
@@ -1185,7 +1185,7 @@ Andrew</p>]]></field>
             <field name="activity_type_id" ref="mail.mail_activity_data_email"/>
             <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=3)).strftime('%Y-%m-%d %H:%M')" />
             <field name="summary">Send Catalog by Email</field>
-            <field name="create_user_id" ref="base.user_admin"/>
+            <field name="create_uid" ref="base.user_admin"/>
             <field name="user_id" ref="base.user_admin"/>
         </record>
         <record id="activity_3" model="mail.activity">
@@ -1194,7 +1194,7 @@ Andrew</p>]]></field>
             <field name="activity_type_id" ref="mail.mail_activity_data_call"/>
             <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=1)).strftime('%Y-%m-%d %H:%M')" />
             <field name="summary">Call to get system requirements</field>
-            <field name="create_user_id" ref="base.user_admin"/>
+            <field name="create_uid" ref="base.user_admin"/>
             <field name="user_id" ref="base.user_admin"/>
         </record>
         <record id="activity_4" model="mail.activity">
@@ -1203,7 +1203,7 @@ Andrew</p>]]></field>
             <field name="activity_type_id" ref="mail.mail_activity_data_call"/>
             <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=2)).strftime('%Y-%m-%d %H:%M')" />
             <field name="summary">Convert to quote</field>
-            <field name="create_user_id" ref="base.user_admin"/>
+            <field name="create_uid" ref="base.user_admin"/>
             <field name="user_id" ref="base.user_admin"/>
         </record>
         <record id="activity_5" model="mail.activity">
@@ -1213,7 +1213,7 @@ Andrew</p>]]></field>
             <field name="activity_type_id" ref="mail.mail_activity_data_email"/>
             <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=-1)).strftime('%Y-%m-%d %H:%M')" />
             <field name="summary">Send our service pricelist</field>
-            <field name="create_user_id" ref="base.user_admin"/>
+            <field name="create_uid" ref="base.user_admin"/>
         </record>
         <record id="activity_6" model="mail.activity">
             <field name="res_id" ref="crm.crm_case_18" />
@@ -1221,7 +1221,7 @@ Andrew</p>]]></field>
             <field name="activity_type_id" ref="mail.mail_activity_data_call"/>
             <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=1)).strftime('%Y-%m-%d %H:%M')" />
             <field name="summary">Call to get training needs</field>
-            <field name="create_user_id" ref="base.user_admin"/>
+            <field name="create_uid" ref="base.user_admin"/>
             <field name="user_id" ref="base.user_admin"/>
         </record>
         <record id="activity_7" model="mail.activity">
@@ -1231,7 +1231,7 @@ Andrew</p>]]></field>
             <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=-2)).strftime('%Y-%m-%d %H:%M')" />
             <field name="summary">Followup on the proposal</field>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="create_user_id" ref="base.user_admin"/>
+            <field name="create_uid" ref="base.user_admin"/>
         </record>
         <record id="activity_8" model="mail.activity">
             <field name="res_id" ref="crm.crm_case_20" />
@@ -1250,7 +1250,7 @@ Andrew</p>]]></field>
             <field name="res_model_id" ref="crm.model_crm_lead"/>
             <field name="activity_type_id" ref="mail.mail_activity_data_email"/>
             <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=-2)).strftime('%Y-%m-%d %H:%M')" />
-            <field name="create_user_id" ref="base.user_admin"/>
+            <field name="create_uid" ref="base.user_admin"/>
             <field name="user_id" ref="base.user_admin"/>
         </record>
         <record id="activity_11" model="mail.activity">
@@ -1258,7 +1258,7 @@ Andrew</p>]]></field>
             <field name="res_model_id" ref="crm.model_crm_lead"/>
             <field name="activity_type_id" ref="mail.mail_activity_data_email"/>
             <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=1)).strftime('%Y-%m-%d %H:%M')" />
-            <field name="create_user_id" ref="base.user_admin"/>
+            <field name="create_uid" ref="base.user_admin"/>
             <field name="user_id" ref="base.user_admin"/>
         </record>
         <record id="activity_12" model="mail.activity">
@@ -1266,7 +1266,7 @@ Andrew</p>]]></field>
             <field name="res_model_id" ref="crm.model_crm_lead"/>
             <field name="activity_type_id" ref="mail.mail_activity_data_email"/>
             <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=2)).strftime('%Y-%m-%d %H:%M')" />
-            <field name="create_user_id" ref="base.user_admin"/>
+            <field name="create_uid" ref="base.user_admin"/>
             <field name="user_id" ref="base.user_admin"/>
         </record>
         <record id="activity_13" model="mail.activity">
@@ -1275,7 +1275,7 @@ Andrew</p>]]></field>
             <field name="activity_type_id" ref="mail.mail_activity_data_call"/>
             <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=0)).strftime('%Y-%m-%d %H:%M')" />
             <field name="summary">Conf call with technical service</field>
-            <field name="create_user_id" ref="base.user_admin"/>
+            <field name="create_uid" ref="base.user_admin"/>
             <field name="user_id" ref="base.user_admin"/>
         </record>
         <record id="activity_14" model="mail.activity">
@@ -1285,7 +1285,7 @@ Andrew</p>]]></field>
             <field name="activity_type_id" ref="mail.mail_activity_data_email"/>
             <field name="date_deadline" eval="(DateTime.today() + relativedelta(days=0)).strftime('%Y-%m-%d %H:%M')" />
             <field name="summary">Send Catalog by Email</field>
-            <field name="create_user_id" ref="base.user_admin"/>
+            <field name="create_uid" ref="base.user_admin"/>
         </record>
 
     </data>
diff --git a/addons/hr_recruitment/data/hr_recruitment_demo.xml b/addons/hr_recruitment/data/hr_recruitment_demo.xml
index 82c6165549e..bd1bbdc00a8 100644
--- a/addons/hr_recruitment/data/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/data/hr_recruitment_demo.xml
@@ -359,7 +359,7 @@
         <field name="activity_type_id" ref="mail.mail_activity_data_email" />
         <field name="date_deadline" eval="time.strftime('%Y-%m-27 18:15:00')"/>
         <field name="summary">Send mail regarding our interview</field>
-        <field name="create_user_id" ref="base.user_admin"/>
+        <field name="create_uid" ref="base.user_admin"/>
         <field name="user_id" ref="base.user_admin"/>
     </record>
     <record id="mail_activity_1" model="mail.activity">
@@ -368,7 +368,7 @@
         <field name="activity_type_id" ref="mail.mail_activity_data_email" />
         <field name="date_deadline" eval="time.strftime('%Y-%m-%d')"/>
         <field name="summary">Send mail for first interview</field>
-        <field name="create_user_id" ref="base.user_admin"/>
+        <field name="create_uid" ref="base.user_admin"/>
         <field name="user_id" ref="base.user_admin"/>
     </record>
     <record id="mail_activity_2" model="mail.activity">
@@ -377,7 +377,7 @@
         <field name="activity_type_id" ref="mail.mail_activity_data_email" />
         <field name="date_deadline" eval="time.strftime('%Y-%m-15 18:15:00')"/>
         <field name="summary">Send mail regarding our interview</field>
-        <field name="create_user_id" ref="base.user_admin"/>
+        <field name="create_uid" ref="base.user_admin"/>
         <field name="user_id" ref="base.user_admin"/>
     </record>
     <record id="mail_activity_3" model="mail.activity">
@@ -386,7 +386,7 @@
         <field name="activity_type_id" ref="mail.mail_activity_data_call" />
         <field name="date_deadline" eval="time.strftime('%Y-%m-10 18:15:00')"/>
         <field name="summary">Call to define real needs about training</field>
-        <field name="create_user_id" ref="base.user_admin"/>
+        <field name="create_uid" ref="base.user_admin"/>
         <field name="user_id" ref="base.user_admin"/>
     </record>
     <record id="mail_activity_4" model="mail.activity">
@@ -395,7 +395,7 @@
         <field name="activity_type_id" ref="mail.mail_activity_data_call" />
         <field name="date_deadline" eval="time.strftime('%Y-%m-24 18:15:00')"/>
         <field name="summary">Call to define real needs about training</field>
-        <field name="create_user_id" ref="base.user_admin"/>
+        <field name="create_uid" ref="base.user_admin"/>
         <field name="user_id" ref="base.user_admin"/>
     </record>
     <record id="mail_activity_5" model="mail.activity">
@@ -404,7 +404,7 @@
         <field name="activity_type_id" ref="mail.mail_activity_data_call" />
         <field name="date_deadline" eval="time.strftime('%Y-%m-26 18:15:00')"/>
         <field name="summary">Call to schedule a second interview</field>
-        <field name="create_user_id" ref="base.user_admin"/>
+        <field name="create_uid" ref="base.user_admin"/>
         <field name="user_id" ref="base.user_admin"/>
     </record>
     <record id="mail_activity_6" model="mail.activity">
@@ -413,7 +413,7 @@
         <field name="activity_type_id" ref="mail.mail_activity_data_call" />
         <field name="date_deadline" eval="time.strftime('%Y-%m-18 17:15:00')"/>
         <field name="summary">Call to propose a contract</field>
-        <field name="create_user_id" ref="base.user_admin"/>
+        <field name="create_uid" ref="base.user_admin"/>
         <field name="user_id" ref="base.user_admin"/>
     </record>
 
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index 9553cc5b69e..ec4868a9a75 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -327,7 +327,7 @@
 
         <template id="message_activity_assigned">
 <div style="margin: 0px; padding: 0px; font-size: 13px;">
-    <span t-field="activity.create_user_id.name"/> assigned you an activity <span t-field="activity.activity_type_id.name"/>
+    <span t-field="activity.create_uid.name"/> assigned you an activity <span t-field="activity.activity_type_id.name"/>
     <t t-if="activity.summary">(<span t-field="activity.summary"/>)</t>
     on <span t-field="activity.res_name"/>
     to close for <span t-field="activity.date_deadline"/>.<br />
diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py
index 3bddb647bde..c93d68c66b6 100644
--- a/addons/mail/models/mail_activity.py
+++ b/addons/mail/models/mail_activity.py
@@ -136,10 +136,6 @@ class MailActivity(models.Model):
         'res.users', 'Assigned to',
         default=lambda self: self.env.user,
         index=True, required=True)
-    create_user_id = fields.Many2one(
-        'res.users', 'Creator',
-        default=lambda self: self.env.user,
-        index=True)
     state = fields.Selection([
         ('overdue', 'Overdue'),
         ('today', 'Today'),
diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml
index 79f6f44bae1..f4493dad93a 100644
--- a/addons/mail/security/mail_security.xml
+++ b/addons/mail/security/mail_security.xml
@@ -43,7 +43,7 @@
         <record id="mail_activity_rule_user" model="ir.rule">
             <field name="name">mail.activity: user: write/unlink only (created or assigned)</field>
             <field name="model_id" ref="model_mail_activity"/>
-            <field name="domain_force">['|', ('user_id', '=', user.id), ('create_user_id', '=', user.id)]</field>
+            <field name="domain_force">['|', ('user_id', '=', user.id), ('create_uid', '=', user.id)]</field>
             <field name="groups" eval="[(4, ref('base.group_user'))]"/>
             <field name="perm_create" eval="False"/>
             <field name="perm_read" eval="False"/>
diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml
index 80618f7024c..a327806883c 100644
--- a/addons/mail/static/src/xml/activity.xml
+++ b/addons/mail/static/src/xml/activity.xml
@@ -42,12 +42,12 @@
                                     <dd class="mb8">
                                         <t t-esc="activity.create_date.format(datetimeFormat)"/>
                                         by
-                                        <img t-attf-src="/web/image#{activity.create_user_id[0] >= 0 ? ('/res.users/' + activity.create_user_id[0] + '/image_small') : ''}"
+                                        <img t-attf-src="/web/image#{activity.create_uid[0] >= 0 ? ('/res.users/' + activity.create_uid[0] + '/image_small') : ''}"
                                             height="18" width="18"
                                             class="rounded-circle mr4"
-                                            t-att-title="activity.create_user_id[1]"
-                                            t-att-alt="activity.create_user_id[1]"/>
-                                        <b><t t-esc="activity.create_user_id[1]"/></b>
+                                            t-att-title="activity.create_uid[1]"
+                                            t-att-alt="activity.create_uid[1]"/>
+                                        <b><t t-esc="activity.create_uid[1]"/></b>
                                     </dd>
                                     <dt>Assigned to</dt>
                                     <dd class="mb8">
diff --git a/addons/mail/static/tests/chatter_tests.js b/addons/mail/static/tests/chatter_tests.js
index c319ac562d5..b6eec0cd5e4 100644
--- a/addons/mail/static/tests/chatter_tests.js
+++ b/addons/mail/static/tests/chatter_tests.js
@@ -72,8 +72,7 @@ QUnit.module('Chatter', {
             'mail.activity': {
                 fields: {
                     activity_type_id: { string: "Activity type", type: "many2one", relation: "mail.activity.type" },
-                    create_uid: { string: "Assigned to", type: "many2one", relation: 'partner' },
-                    create_user_id: { string: "Creator", type: "many2one", relation: 'partner' },
+                    create_uid: { string: "Created By", type: "many2one", relation: 'partner' },
                     can_write: { string: "Can write", type: "boolean" },
                     display_name: { string: "Display name", type: "char" },
                     date_deadline: { string: "Due Date", type: "date" },
@@ -516,7 +515,7 @@ QUnit.test('kanban activity widget with an activity', function (assert) {
         can_write: true,
         state: "today",
         user_id: 2,
-        create_user_id: 2,
+        create_uid: 2,
         activity_type_id: 1,
     }];
     var rpcCount = 0;
@@ -591,7 +590,7 @@ QUnit.test('kanban activity widget popover test', function (assert) {
         can_write: true,
         state: "today",
         user_id: 2,
-        create_user_id: 2,
+        create_uid: 2,
         activity_type_id: 1,
     }];
     var rpcCount = 0;
@@ -1483,7 +1482,7 @@ QUnit.test('form activity widget: read RPCs', function (assert) {
         can_write: true,
         state: "today",
         user_id: 2,
-        create_user_id: 2,
+        create_uid: 2,
         activity_type_id: 2,
     }];
 
@@ -1569,7 +1568,7 @@ QUnit.test('form activity widget with another x2many field in view', function (a
         can_write: true,
         state: "today",
         user_id: 2,
-        create_user_id: 2,
+        create_uid: 2,
         activity_type_id: 2,
     }];
 
@@ -1604,7 +1603,7 @@ QUnit.test('form activity widget: schedule next activity', function (assert) {
         can_write: true,
         state: "today",
         user_id: 2,
-        create_user_id: 2,
+        create_uid: 2,
         activity_type_id: 2,
     }];
 
@@ -1661,7 +1660,7 @@ QUnit.test('form activity widget: edit next activity', function (assert) {
         can_write: true,
         state: "today",
         user_id: 2,
-        create_user_id: 2,
+        create_uid: 2,
         activity_type_id: 2,
     }];
 
@@ -1844,7 +1843,7 @@ QUnit.test('form activity widget: mark as done and remove', function (assert) {
         can_write: true,
         state: "today",
         user_id: 2,
-        create_user_id: 2,
+        create_uid: 2,
         activity_type_id: 1,
     }, {
         id: 2,
@@ -1853,7 +1852,7 @@ QUnit.test('form activity widget: mark as done and remove', function (assert) {
         can_write: true,
         state: "today",
         user_id: 2,
-        create_user_id: 2,
+        create_uid: 2,
         activity_type_id: 1,
     }];
 
diff --git a/addons/mail/views/mail_activity_views.xml b/addons/mail/views/mail_activity_views.xml
index b540844fc39..1c833db1bd3 100644
--- a/addons/mail/views/mail_activity_views.xml
+++ b/addons/mail/views/mail_activity_views.xml
@@ -168,7 +168,7 @@
                 <separator/>
                 <group expand="0" string="Group By">
                     <filter string="Deadline" name="date_deadline" context="{'group_by': 'date_deadline'}"/>
-                    <filter string="Created By" name="createdby" context="{'group_by': 'create_user_id'}"/>
+                    <filter string="Created By" name="createdby" context="{'group_by': 'create_uid'}"/>
                     <filter string="Activity Type" name="activittype" context="{'group_by': 'activity_type_id'}"/>
                 </group>
             </search>
diff --git a/addons/test_mail/tests/test_mail_activity.py b/addons/test_mail/tests/test_mail_activity.py
index d0407259609..10cade0e0a5 100644
--- a/addons/test_mail/tests/test_mail_activity.py
+++ b/addons/test_mail/tests/test_mail_activity.py
@@ -138,7 +138,7 @@ class TestActivityFlow(TestActivityCommon):
             activity = rec.activity_schedule(
                 'test_mail.mail_act_test_todo',
                 user_id=self.user_admin.id)
-        self.assertEqual(activity.create_user_id, self.user_employee)
+        self.assertEqual(activity.create_uid, self.user_employee)
         self.assertEqual(activity.user_id, self.user_admin)
 
     def test_activity_notify_same_user(self):
@@ -148,7 +148,7 @@ class TestActivityFlow(TestActivityCommon):
             activity = rec.activity_schedule(
                 'test_mail.mail_act_test_todo',
                 user_id=self.user_employee.id)
-        self.assertEqual(activity.create_user_id, self.user_employee)
+        self.assertEqual(activity.create_uid, self.user_employee)
         self.assertEqual(activity.user_id, self.user_employee)