diff options
| author | Sébastien Theys <seb@odoo.com> | 2020-02-10 12:38:52 +0000 |
|---|---|---|
| committer | Sébastien Theys <seb@odoo.com> | 2020-02-10 13:05:04 +0000 |
| commit | 5018b01dc7e0e5f2c2198367f13ec41b1ed402c7 (patch) | |
| tree | 203d080acdde573908db7eff49030adbb924b4c7 /addons/mail/static/src/js/models/threads | |
| parent | b7ade94c30cfb78dbb94d01b76be17f7175e1eb2 (diff) | |
[IMP] mail, test_mail, hr_holidays: remove obsolete out of office
The customizable "out of office" text was removed from the editable views as
part of task-2053585, but some places in the code were still using it, even
though it was never set anymore.
This commit removes the obsolete code.
Part of task-2171864
closes odoo/odoo#44968
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Diffstat (limited to 'addons/mail/static/src/js/models/threads')
| -rw-r--r-- | addons/mail/static/src/js/models/threads/abstract_thread.js | 10 | ||||
| -rw-r--r-- | addons/mail/static/src/js/models/threads/dm_chat.js | 13 |
2 files changed, 1 insertions, 22 deletions
diff --git a/addons/mail/static/src/js/models/threads/abstract_thread.js b/addons/mail/static/src/js/models/threads/abstract_thread.js index 6961ba48175..ed10e761d62 100644 --- a/addons/mail/static/src/js/models/threads/abstract_thread.js +++ b/addons/mail/static/src/js/models/threads/abstract_thread.js @@ -83,14 +83,6 @@ var AbstractThread = Class.extend(Mixins.EventDispatcherMixin, { return undefined; }, /** - * By default, threads do not have out-of-office feature - * - * @return {string|undefined} - */ - getOutOfOfficeMessage: function () { - return undefined; - }, - /** * Get the status of the thread (e.g. 'online', 'offline', etc.) * * @returns {string} @@ -122,7 +114,7 @@ var AbstractThread = Class.extend(Mixins.EventDispatcherMixin, { * @return {boolean} */ hasOutOfOffice() { - return !!(this.getOutOfOfficeMessage() || this.getOutOfOfficeInfo()); + return !!this.getOutOfOfficeInfo(); }, /** * States whether this thread is compatible with the 'seen' feature. diff --git a/addons/mail/static/src/js/models/threads/dm_chat.js b/addons/mail/static/src/js/models/threads/dm_chat.js index 6b56cd2c80d..b811b5a5cd5 100644 --- a/addons/mail/static/src/js/models/threads/dm_chat.js +++ b/addons/mail/static/src/js/models/threads/dm_chat.js @@ -23,7 +23,6 @@ var DMChat = TwoUserChannel.extend(ChannelSeenMixin, { * @param {integer} params.data.direct_partner[0].id * @param {string} params.data.direct_partner[0].im_status * @param {string} params.data.direct_partner[0].name - * @param {string} [params.data.direct_partner[0].out_of_office_message] * @param {string} [params.data.direct_partner[0].out_of_office_date_end] */ init: function (params) { @@ -34,7 +33,6 @@ var DMChat = TwoUserChannel.extend(ChannelSeenMixin, { this._directPartnerID = data.direct_partner[0].id; this._name = data.custom_channel_name || data.direct_partner[0].name; - this._outOfOfficeMessage = data.direct_partner[0].out_of_office_message; this._outOfOfficeDateEnd = data.direct_partner[0].out_of_office_date_end; this._type = 'dm_chat'; @@ -78,15 +76,6 @@ var DMChat = TwoUserChannel.extend(ChannelSeenMixin, { return _.str.sprintf(_t("Out of office until %s"), formattedDate); }, /** - * Get the out of office message of the thread - * - * @override {mail.model.AbstractThread} - * @returns {string} - */ - getOutOfOfficeMessage: function () { - return this._outOfOfficeMessage; - }, - /** * @override */ getPreview: function () { @@ -104,11 +93,9 @@ var DMChat = TwoUserChannel.extend(ChannelSeenMixin, { /** * @param {Object} data - * @param {string} data.outOfOfficeMessage * @param {string} data.outOfOfficeDateEnd */ updateOutOfOfficeInfo: function (data) { - this._outOfOfficeMessage = data.outOfOfficeMessage; this._outOfOfficeDateEnd = data.outOfOfficeDateEnd; this.call('mail_service', 'getMailBus').trigger('updated_out_of_office', { threadID: this.getID(), |
