diff options
| author | Thibault Delavallée <tde@odoo.com> | 2019-07-18 08:34:23 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2019-07-18 09:20:06 +0000 |
| commit | 2b7ad217f1a55a0687ba4ec4765bc7777114aac0 (patch) | |
| tree | 4647b02d3fb8d535848f4da6bbbe5ae046192431 /addons | |
| parent | ac212ae65dccf8637a7636547aa07f77ddefb357 (diff) | |
[FIX] mail, sms: post sms message as a note on related document and apply various fixes
PURPOSE
Improve use of SMS. Followup of merge 4287481bf03fbb6539313ff657af0ca58e2895e7 .
SPECIFICATIONS
Currently when sending an SMS through the UI a message is posted using the
comment subtype. However it is better to lessen number of notifications
and log using the note subtype as it is mainly a log to know something has
been sent.
Order SMS by ID desc to ease finding them in technical menu.
Mail, sms: fix wording of mail / SMS failures
Linked to task 1925950 and 1935280
Part of PR #34864
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mail/static/src/js/models/mail_failure.js | 2 | ||||
| -rw-r--r-- | addons/sms/models/mail_thread.py | 2 | ||||
| -rw-r--r-- | addons/sms/models/sms_sms.py | 1 | ||||
| -rw-r--r-- | addons/sms/static/src/js/mail_failure.js | 2 | ||||
| -rw-r--r-- | addons/test_mail_full/tests/test_sms_post.py | 10 |
5 files changed, 14 insertions, 3 deletions
diff --git a/addons/mail/static/src/js/models/mail_failure.js b/addons/mail/static/src/js/models/mail_failure.js index 4c5f93be5dd..232dd86152c 100644 --- a/addons/mail/static/src/js/models/mail_failure.js +++ b/addons/mail/static/src/js/models/mail_failure.js @@ -87,7 +87,7 @@ var MailFailure = Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, { */ getPreview: function () { var preview = { - body: _t("An error occured when sending an email"), + body: _t("An error occurred when sending an email"), date: this._lastMessageDate, documentID: this._documentID, documentModel: this._documentModel, diff --git a/addons/sms/models/mail_thread.py b/addons/sms/models/mail_thread.py index 36c5df282be..e6d5dffdee9 100644 --- a/addons/sms/models/mail_thread.py +++ b/addons/sms/models/mail_thread.py @@ -182,7 +182,7 @@ class MailThread(models.AbstractModel): sms_numbers = [info_number] + (sms_numbers or []) if subtype_id is False: - subtype_id = self.env['ir.model.data'].xmlid_to_res_id('mail.mt_comment') + subtype_id = self.env['ir.model.data'].xmlid_to_res_id('mail.mt_note') return self.message_post( body=body, partner_ids=partner_ids or [], # TDE FIXME: temp fix otherwise crash mail_thread.py diff --git a/addons/sms/models/sms_sms.py b/addons/sms/models/sms_sms.py index 8bcec14eecf..df275a8483c 100644 --- a/addons/sms/models/sms_sms.py +++ b/addons/sms/models/sms_sms.py @@ -13,6 +13,7 @@ class SmsSms(models.Model): _name = 'sms.sms' _description = 'Outgoing SMS' _rec_name = 'number' + _order = 'id DESC' number = fields.Char('Number', required=True) body = fields.Text() diff --git a/addons/sms/static/src/js/mail_failure.js b/addons/sms/static/src/js/mail_failure.js index 0acb8cad76a..653086895f8 100644 --- a/addons/sms/static/src/js/mail_failure.js +++ b/addons/sms/static/src/js/mail_failure.js @@ -18,7 +18,7 @@ MailFailure.include({ var preview = this._super.apply(this, arguments); if (this._failureType === 'sms') { _.extend(preview, { - body: _t('An error occurred when sending SMS'), + body: _t('An error occurred when sending an SMS'), id: 'sms_failure', }); } diff --git a/addons/test_mail_full/tests/test_sms_post.py b/addons/test_mail_full/tests/test_sms_post.py index 489250fde1c..26734cfa258 100644 --- a/addons/test_mail_full/tests/test_sms_post.py +++ b/addons/test_mail_full/tests/test_sms_post.py @@ -37,6 +37,7 @@ class TestSMSPost(test_mail_full_common.BaseFunctionalTest, sms_common.MockSMS, messages = test_record._message_sms('<p>Mega SMS<br/>Top moumoutte</p>', partner_ids=self.partner_1.ids) self.assertEqual(messages.body, '<p>Mega SMS<br>Top moumoutte</p>') + self.assertEqual(messages.subtype_id, self.env.ref('mail.mt_note')) self.assertSMSNotification([{'partner': self.partner_1}], 'Mega SMS\nTop moumoutte', messages) def test_message_sms_internals_check_existing(self): @@ -58,6 +59,15 @@ class TestSMSPost(test_mail_full_common.BaseFunctionalTest, sms_common.MockSMS, self.assertSMSNotification([{'partner': self.partner_1}, {'number': self.random_numbers_san[0]}, {'number': self.random_numbers_san[1]}], self._test_body, messages) + def test_message_sms_internals_subtype(self): + with self.sudo('employee'), self.mockSMSGateway(): + test_record = self.env['mail.test.sms'].browse(self.test_record.id) + messages = test_record._message_sms('<p>Mega SMS<br/>Top moumoutte</p>', subtype_id=self.env.ref('mail.mt_comment').id, partner_ids=self.partner_1.ids) + + self.assertEqual(messages.body, '<p>Mega SMS<br>Top moumoutte</p>') + self.assertEqual(messages.subtype_id, self.env.ref('mail.mt_comment')) + self.assertSMSNotification([{'partner': self.partner_1}], 'Mega SMS\nTop moumoutte', messages) + def test_message_sms_internals_pid_to_number(self): pid_to_number = { self.partner_1.id: self.random_numbers[0], |
