diff options
| author | Robot Odoo <xmo+roboto@odoo.com> | 2019-02-11 12:57:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-11 12:57:48 +0100 |
| commit | 47bb7ef7968cb3c5c11f767df06fcf09333a2b13 (patch) | |
| tree | 1e86b27e45fe2b5803294e886227495fdd68a96b /addons/mail/static/src/js/composers/basic_composer.js | |
| parent | 768844040f887868759309ad101fe50191fc949a (diff) | |
| parent | 975164473ccd51c00eee5917dddbd8be71b5aefc (diff) | |
[MERGE] mail, hr_holidays, *: add out of office status
*: base, bus, mail_bot, test_mail
Before this task, it was not easy to tell when a user is not available (or is on holiday)
from conversations, such as from chat windows.
With this task, a user can now tell that he is out-of-office from the user menu preferences,
by defining an an out-of-office message. This information will be displayed to other users from
chat conversations and mention suggestions (i.e. with `@`).
Also, the computation of the user `im_status` has been changed when he has an active leave:
an out-of-office message can be set on the leave, and this will be displayed on conversations
instead of the user's out-of-office message from the user menu preferences.
Task: 1856205
closes odoo/odoo#29974
Diffstat (limited to 'addons/mail/static/src/js/composers/basic_composer.js')
| -rw-r--r-- | addons/mail/static/src/js/composers/basic_composer.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/addons/mail/static/src/js/composers/basic_composer.js b/addons/mail/static/src/js/composers/basic_composer.js index 8a045ac2d82..58e334808bf 100644 --- a/addons/mail/static/src/js/composers/basic_composer.js +++ b/addons/mail/static/src/js/composers/basic_composer.js @@ -371,7 +371,15 @@ var BasicComposer = Widget.extend({ { limit: limit, search: search } ); } - return suggestions; + return $.when(suggestions).then(function (suggestions) { + //add im_status on suggestions + _.each(suggestions, function (suggestionsSet) { + _.each(suggestionsSet, function (suggestion) { + suggestion.im_status = self.call('mail_service', 'getImStatus', { partnerID: suggestion.id }); + }); + }); + return suggestions; + }); }); }, /** |
