diff options
Diffstat (limited to 'addons/mail/static/src/js/activity.js')
| -rw-r--r-- | addons/mail/static/src/js/activity.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/addons/mail/static/src/js/activity.js b/addons/mail/static/src/js/activity.js index d99abb11e7d..ca0d5113c2c 100644 --- a/addons/mail/static/src/js/activity.js +++ b/addons/mail/static/src/js/activity.js @@ -29,11 +29,15 @@ function _readActivities(self, ids) { if (!ids.length) { return $.when([]); } + var context = self.getSession().user_context; + if (self.record && !_.isEmpty(self.record.getContext())) { + context = self.record.getContext(); + } return self._rpc({ model: 'mail.activity', method: 'activity_format', args: [ids], - context: (self.record && self.record.getContext()) || self.getSession().user_context, + context: context, }).then(function (activities) { // convert create_date and date_deadline to moments _.each(activities, function (activity) { |