diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-10-09 02:08:17 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-10-09 02:08:17 +0200 |
| commit | d74b4518052066446e2a1975a91ce53c745ca75a (patch) | |
| tree | c08180f88a512d15e37fbec628931f02b3825f65 /addons/sms/static/src/js | |
| parent | ec162dd0cb5622ab6e56db1a63dab5f531a96f4a (diff) | |
| parent | f4105eb9c7010f8693e5d2fd20c0bd9d9cc2e483 (diff) | |
[MERGE] forward port branch 13.0 up to f4105eb9c70
Diffstat (limited to 'addons/sms/static/src/js')
| -rw-r--r-- | addons/sms/static/src/js/fields_phone_widget.js | 4 | ||||
| -rw-r--r-- | addons/sms/static/src/js/message.js | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/addons/sms/static/src/js/fields_phone_widget.js b/addons/sms/static/src/js/fields_phone_widget.js index ecbe784d22d..f269b26d0ed 100644 --- a/addons/sms/static/src/js/fields_phone_widget.js +++ b/addons/sms/static/src/js/fields_phone_widget.js @@ -58,8 +58,10 @@ Phone.include({ var $composerButton = $('<a>', { title: _t('Send SMS Text Message'), href: '', - class: 'btn-sm btn-link mb4 fa fa-comment o_field_phone_sms', + class: 'ml-3 d-inline-flex align-items-center o_field_phone_sms', + html: $('<small>', {class: 'font-weight-bold ml-1', html: 'SMS'}), }); + $composerButton.prepend($('<i>', {class: 'fa fa-mobile'})); $composerButton.on('click', this._onClickSMS.bind(this)); this.$el = $('<div/>').append(this.$el).append($composerButton); } diff --git a/addons/sms/static/src/js/message.js b/addons/sms/static/src/js/message.js index b5463ae9f8f..27ab85b0d21 100644 --- a/addons/sms/static/src/js/message.js +++ b/addons/sms/static/src/js/message.js @@ -59,7 +59,9 @@ Message.include({ var sms = _.find(self._smsIds, function (sms) { return sms[0] === smsID; }); - sms[2] = smsStatus; + if (sms !== undefined && smsStatus !== undefined) { + sms[2] = smsStatus; + } }, //-------------------------------------------------------------------------- |