diff options
| author | Xavier-Do <xdo@odoo.com> | 2019-07-31 09:38:30 +0000 |
|---|---|---|
| committer | Xavier-Do <xdo@odoo.com> | 2019-08-05 11:50:20 +0000 |
| commit | bb37ab21199d9f17e180f225916f5f66c87af660 (patch) | |
| tree | 8655632fc45fe459294eda89e0dacf54c06742e0 | |
| parent | 0c37b9fb39005eab70ee8b39da84f79c981b2695 (diff) | |
[REF] mail, test_mail, *: rename needaction_partner_ids to notified_partner_ids
,*:crm, website_blog
The mail.message needaction_partner_ids meaning changed over time,
and doesn't actually reflect the list of partner in needaction.
More than that the message_format needaction_partner_ids used by js
began to diverged from mail.message field since 19fb650863f11172c8a6839fcc10919e9ca9977b
To avoid any confusion, renaming it to notified_partner_ids will help
to avoid confusion between python and js meaning, and reflect the actual
content of this field : a list of partner that where notified once on
this message. This field is mainly usefull for testing.
Task-ID 402597
| -rw-r--r-- | addons/crm/tests/test_crm_activity.py | 2 | ||||
| -rw-r--r-- | addons/crm/tests/test_new_lead_notification.py | 2 | ||||
| -rw-r--r-- | addons/mail/models/mail_message.py | 10 | ||||
| -rw-r--r-- | addons/mail/views/mail_message_views.xml | 2 | ||||
| -rw-r--r-- | addons/test_mail/tests/test_message_compose.py | 12 | ||||
| -rw-r--r-- | addons/test_mail/tests/test_message_track.py | 4 | ||||
| -rw-r--r-- | addons/test_mail/tests/test_performance.py | 24 | ||||
| -rw-r--r-- | addons/website_blog/tests/test_website_blog_flow.py | 2 | ||||
| -rw-r--r-- | git | 0 |
9 files changed, 30 insertions, 28 deletions
diff --git a/addons/crm/tests/test_crm_activity.py b/addons/crm/tests/test_crm_activity.py index 5eaf0368ab0..5296f2ead5b 100644 --- a/addons/crm/tests/test_crm_activity.py +++ b/addons/crm/tests/test_crm_activity.py @@ -77,7 +77,7 @@ class TestCrmMailActivity(TestCrmCases): self.assertFalse(self.lead.activity_type_id.id) self.assertFalse(self.lead.activity_ids) activity_message = self.lead.message_ids[0] - self.assertEqual(activity_message.needaction_partner_ids, self.crm_salemanager.partner_id) + self.assertEqual(activity_message.notified_partner_ids, self.crm_salemanager.partner_id) self.assertEqual(activity_message.subtype_id, self.env.ref('mail.mt_activities')) def test_crm_activity_next_action(self): diff --git a/addons/crm/tests/test_new_lead_notification.py b/addons/crm/tests/test_new_lead_notification.py index 622399f76c2..932ee751efc 100644 --- a/addons/crm/tests/test_new_lead_notification.py +++ b/addons/crm/tests/test_new_lead_notification.py @@ -35,7 +35,7 @@ class NewLeadNotification(TestCrmCases): self.assertIn(channel_listen, lead.message_channel_ids) msg = lead.message_ids[0] - self.assertIn(self.crm_salesman.partner_id, msg.needaction_partner_ids) + self.assertIn(self.crm_salesman.partner_id, msg.notified_partner_ids) self.assertIn(channel_listen, msg.channel_ids) # The user should have a new unread message diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py index a7061c77d34..1cb477bfd0b 100644 --- a/addons/mail/models/mail_message.py +++ b/addons/mail/models/mail_message.py @@ -83,7 +83,9 @@ class Message(models.Model): # recipients: include inactive partners (they may have been archived after # the message was sent, but they should remain visible in the relation) partner_ids = fields.Many2many('res.partner', string='Recipients', context={'active_test': False}) - needaction_partner_ids = fields.Many2many( + # list of partner having a notification. Caution: list may change over time because of notif gc cron. + # mainly usefull for testing + notified_partner_ids = fields.Many2many( 'res.partner', 'mail_message_res_partner_needaction_rel', string='Partners with Need Action', context={'active_test': False}) needaction = fields.Boolean( @@ -195,7 +197,7 @@ class Message(models.Model): # search, and one for each message in the result set is_read to True in the # current notifications from the relation. partner_id = self.env.user.partner_id.id - msg_domain = [('needaction_partner_ids', 'in', partner_id)] + msg_domain = [('notified_partner_ids', 'in', partner_id)] unread_messages = self.search(expression.AND([msg_domain, domain])) ids = unread_messages.ids notifications = self.env['mail.notification'].sudo().search([ @@ -295,8 +297,8 @@ class Message(models.Model): partners |= message.partner_ids elif not message.subtype_id and message.partner_ids: # take specified people of message without a subtype (log) partners |= message.partner_ids - if message.needaction_partner_ids: # notified - partners |= message.needaction_partner_ids + if message.notified_partner_ids: # notified + partners |= message.notified_partner_ids if message.attachment_ids: attachments |= message.attachment_ids # Read partners as SUPERUSER -> message being browsed as SUPERUSER it is already the case diff --git a/addons/mail/views/mail_message_views.xml b/addons/mail/views/mail_message_views.xml index 30efd3a9404..6d988973665 100644 --- a/addons/mail/views/mail_message_views.xml +++ b/addons/mail/views/mail_message_views.xml @@ -66,7 +66,7 @@ <field name="channel_ids" widget="many2many_tags"/> </group> <group> - <field name="needaction_partner_ids" widget="many2many_tags"/> + <field name="notified_partner_ids" widget="many2many_tags"/> <field name="starred_partner_ids" widget="many2many_tags"/> </group> </group> diff --git a/addons/test_mail/tests/test_message_compose.py b/addons/test_mail/tests/test_message_compose.py index bb1ca460a88..adf1dd80ae6 100644 --- a/addons/test_mail/tests/test_message_compose.py +++ b/addons/test_mail/tests/test_message_compose.py @@ -45,7 +45,7 @@ class TestMessagePost(BaseFunctionalTest, MockEmails, TestRecipients): self.assertEqual(msg.subject, _subject) self.assertEqual(msg.body, _body) self.assertEqual(msg.partner_ids, self.partner_1 | self.partner_2) - self.assertEqual(msg.needaction_partner_ids, self.user_admin.partner_id | self.partner_1 | self.partner_2) + self.assertEqual(msg.notified_partner_ids, self.user_admin.partner_id | self.partner_1 | self.partner_2) self.assertEqual(msg.channel_ids, self.env['mail.channel']) # notifications emails should have been deleted @@ -161,7 +161,7 @@ class TestMessagePost(BaseFunctionalTest, MockEmails, TestRecipients): body='<p>Test</p>', subject='Subject', message_type='comment', subtype='mt_comment') - self.assertEqual(new_msg.sudo().needaction_partner_ids, (self.partner_1 | self.user_employee.partner_id)) + self.assertEqual(new_msg.sudo().notified_partner_ids, (self.partner_1 | self.user_employee.partner_id)) self.assertEmails(portal_user.partner_id, [[self.partner_1], [self.user_employee.partner_id]]) def test_post_portal_crash(self): @@ -179,7 +179,7 @@ class TestMessagePost(BaseFunctionalTest, MockEmails, TestRecipients): body='My Body', subject='My Subject', message_type='comment', subtype='mt_note') self.assertEqual(msg.partner_ids, self.env['res.partner']) - self.assertEqual(msg.needaction_partner_ids, self.env['res.partner']) + self.assertEqual(msg.notified_partner_ids, self.env['res.partner']) self.format_and_process( MAIL_TEMPLATE_PLAINTEXT, self.user_admin.email, 'not_my_businesss@example.com', @@ -189,7 +189,7 @@ class TestMessagePost(BaseFunctionalTest, MockEmails, TestRecipients): reply = self.test_record.message_ids - msg self.assertTrue(reply) self.assertEqual(reply.subtype_id, self.env.ref('mail.mt_note')) - self.assertEqual(reply.needaction_partner_ids, self.user_employee.partner_id) + self.assertEqual(reply.notified_partner_ids, self.user_employee.partner_id) self.assertEqual(reply.parent_id, msg) def test_post_log(self): @@ -201,7 +201,7 @@ class TestMessagePost(BaseFunctionalTest, MockEmails, TestRecipients): self.assertEqual(new_note.body, '<p>Labrador</p>') self.assertEqual(new_note.author_id, self.user_employee.partner_id) self.assertEqual(new_note.email_from, formataddr((self.user_employee.name, self.user_employee.email))) - self.assertEqual(new_note.needaction_partner_ids, self.env['res.partner']) + self.assertEqual(new_note.notified_partner_ids, self.env['res.partner']) def test_post_notify(self): self.user_employee.write({'notification_type': 'inbox'}) @@ -216,7 +216,7 @@ class TestMessagePost(BaseFunctionalTest, MockEmails, TestRecipients): self.assertEqual(new_notification.body, '<p>You have received a notification</p>') self.assertEqual(new_notification.author_id, self.env.user.partner_id) self.assertEqual(new_notification.email_from, formataddr((self.env.user.name, self.env.user.email))) - self.assertEqual(new_notification.needaction_partner_ids, self.partner_1 | self.user_employee.partner_id) + self.assertEqual(new_notification.notified_partner_ids, self.partner_1 | self.user_employee.partner_id) self.assertNotIn(new_notification, self.test_record.message_ids) # todo xdo add test message_notify on thread with followers and stuff diff --git a/addons/test_mail/tests/test_message_track.py b/addons/test_mail/tests/test_message_track.py index 3b7adafef64..49d5df613ab 100644 --- a/addons/test_mail/tests/test_message_track.py +++ b/addons/test_mail/tests/test_message_track.py @@ -53,7 +53,7 @@ class TestTracking(common.BaseFunctionalTest, common.MockEmails): # no specific recipients except those following notes, no email self.assertEqual(self.record.message_ids.partner_ids, self.env['res.partner']) - self.assertEqual(self.record.message_ids.needaction_partner_ids, self.env['res.partner']) + self.assertEqual(self.record.message_ids.notified_partner_ids, self.env['res.partner']) self.assertEqual(self._mails, []) # verify tracked value @@ -81,7 +81,7 @@ class TestTracking(common.BaseFunctionalTest, common.MockEmails): # no specific recipients except those following umbrella self.assertEqual(self.record.message_ids.partner_ids, self.env['res.partner']) - self.assertEqual(self.record.message_ids.needaction_partner_ids, self.user_admin.partner_id) + self.assertEqual(self.record.message_ids.notified_partner_ids, self.user_admin.partner_id) # verify tracked value self.assertTracking( diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py index cf01fc1850c..f35b51c55cd 100644 --- a/addons/test_mail/tests/test_performance.py +++ b/addons/test_mail/tests/test_performance.py @@ -380,7 +380,7 @@ class TestHeavyMailPerformance(BaseMailPerformance): subtype='mail.mt_comment') self.assertEqual(record.message_ids[0].body, '<p>Test Post Performances</p>') - self.assertEqual(record.message_ids[0].needaction_partner_ids, self.partners | self.user_portal.partner_id) + self.assertEqual(record.message_ids[0].notified_partner_ids, self.partners | self.user_portal.partner_id) @mute_logger('odoo.tests', 'odoo.addons.mail.models.mail_mail', 'odoo.models.unlink') @users('__system__', 'emp') @@ -394,7 +394,7 @@ class TestHeavyMailPerformance(BaseMailPerformance): record.message_post_with_template(template_id, message_type='comment', composition_mode='comment') self.assertEqual(record.message_ids[0].body, '<p>Adding stuff on %s</p>' % record.name) - self.assertEqual(record.message_ids[0].needaction_partner_ids, self.partners | self.user_portal.partner_id | self.customer) + self.assertEqual(record.message_ids[0].notified_partner_ids, self.partners | self.user_portal.partner_id | self.customer) @mute_logger('odoo.tests', 'odoo.addons.mail.models.mail_mail', 'odoo.models.unlink') @users('__system__', 'emp') @@ -464,10 +464,10 @@ class TestHeavyMailPerformance(BaseMailPerformance): self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) # write tracking message self.assertEqual(rec.message_ids[0].subtype_id, self.env.ref('mail.mt_note')) - self.assertEqual(rec.message_ids[0].needaction_partner_ids, self.env['res.partner']) + self.assertEqual(rec.message_ids[0].notified_partner_ids, self.env['res.partner']) # creation message self.assertEqual(rec.message_ids[1].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) - self.assertEqual(rec.message_ids[1].needaction_partner_ids, self.partners) + self.assertEqual(rec.message_ids[1].notified_partner_ids, self.partners) self.assertEqual(len(rec.message_ids), 2) @mute_logger('odoo.tests', 'odoo.addons.mail.models.mail_mail', 'odoo.models.unlink') @@ -490,7 +490,7 @@ class TestHeavyMailPerformance(BaseMailPerformance): self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) # creation message self.assertEqual(rec.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) - self.assertEqual(rec.message_ids[0].needaction_partner_ids, self.partners | self.user_portal.partner_id) + self.assertEqual(rec.message_ids[0].notified_partner_ids, self.partners | self.user_portal.partner_id) self.assertEqual(len(rec.message_ids), 1) @mute_logger('odoo.tests', 'odoo.addons.mail.models.mail_mail', 'odoo.models.unlink') @@ -515,10 +515,10 @@ class TestHeavyMailPerformance(BaseMailPerformance): self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) # write tracking message self.assertEqual(rec.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) - self.assertEqual(rec.message_ids[0].needaction_partner_ids, self.partners | self.user_portal.partner_id) + self.assertEqual(rec.message_ids[0].notified_partner_ids, self.partners | self.user_portal.partner_id) # creation message self.assertEqual(rec.message_ids[1].subtype_id, self.env.ref('mail.mt_note')) - self.assertEqual(rec.message_ids[1].needaction_partner_ids, self.env['res.partner']) + self.assertEqual(rec.message_ids[1].notified_partner_ids, self.env['res.partner']) self.assertEqual(len(rec.message_ids), 2) @mute_logger('odoo.tests', 'odoo.addons.mail.models.mail_mail', 'odoo.models.unlink') @@ -552,10 +552,10 @@ class TestHeavyMailPerformance(BaseMailPerformance): self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) # write tracking message self.assertEqual(rec.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) - self.assertEqual(rec.message_ids[0].needaction_partner_ids, self.partners | self.user_portal.partner_id) + self.assertEqual(rec.message_ids[0].notified_partner_ids, self.partners | self.user_portal.partner_id) # creation message self.assertEqual(rec.message_ids[1].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) - self.assertEqual(rec.message_ids[1].needaction_partner_ids, self.user_portal.partner_id) + self.assertEqual(rec.message_ids[1].notified_partner_ids, self.user_portal.partner_id) self.assertEqual(len(rec.message_ids), 2) @mute_logger('odoo.tests', 'odoo.addons.mail.models.mail_mail', 'odoo.models.unlink') @@ -586,10 +586,10 @@ class TestHeavyMailPerformance(BaseMailPerformance): self.assertEqual(rec.message_ids[0].subject, 'Test Template') # write tracking message self.assertEqual(rec.message_ids[1].subtype_id, self.env.ref('mail.mt_note')) - self.assertEqual(rec.message_ids[1].needaction_partner_ids, self.env['res.partner']) + self.assertEqual(rec.message_ids[1].notified_partner_ids, self.env['res.partner']) # creation message self.assertEqual(rec.message_ids[2].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd')) - self.assertEqual(rec.message_ids[2].needaction_partner_ids, self.partners | self.user_portal.partner_id) + self.assertEqual(rec.message_ids[2].notified_partner_ids, self.partners | self.user_portal.partner_id) self.assertEqual(len(rec.message_ids), 3) @@ -731,4 +731,4 @@ class TestMailPerformancePost(BaseMailPerformance): self.assertTrue(record.message_ids[0].body.startswith('<p>Test body <img src="/web/image/')) self.assertEqual(self.attachements.mapped('res_model'), [record._name for i in range(3)]) self.assertEqual(self.attachements.mapped('res_id'), [record.id for i in range(3)]) - # self.assertEqual(record.message_ids[0].needaction_partner_ids, []) + # self.assertEqual(record.message_ids[0].notified_partner_ids, []) diff --git a/addons/website_blog/tests/test_website_blog_flow.py b/addons/website_blog/tests/test_website_blog_flow.py index 5f18aea6e8f..0bca765d48c 100644 --- a/addons/website_blog/tests/test_website_blog_flow.py +++ b/addons/website_blog/tests/test_website_blog_flow.py @@ -44,7 +44,7 @@ class TestWebsiteBlogFlow(TestWebsiteBlogCommon): # Check publish message has been sent to blog followers publish_message = next((m for m in test_blog_post.blog_id.message_ids if m.subtype_id.id == self.ref('website_blog.mt_blog_blog_published')), None) self.assertEqual( - publish_message.needaction_partner_ids, + publish_message.notified_partner_ids, self.user_employee.partner_id | self.user_public.partner_id, 'website_blog: peuple following a blog should be notified of a published post') |
