diff options
| author | Alexandre Kühn <aku@odoo.com> | 2017-12-04 11:01:36 +0100 |
|---|---|---|
| committer | Alexandre Kühn <aku@odoo.com> | 2017-12-05 09:13:31 +0100 |
| commit | 6cc5a9963b3cce5d6ddf2cd038def5fe21f17af7 (patch) | |
| tree | 31ec78e726c4965485bfa875c7374678f8f548dc /addons/mail/static/src/js/activity.js | |
| parent | 59729695680b33a1eec8e170777e07ee12cb3925 (diff) | |
[FIX] web,*: time format from user's language
Before this fix, the chatter always showed dates of messages in military time format.
This was not the expected behavior, as the user could have had customize
the date and time format in the settings of the current language.
Steps to reproduce the issue:
1. Set Odoo in English
2. Settings > Translations > Languages > English
2.1. Set Date Format to %m/%d/%Y
2.2. Set Time Format to %I:%M:%S %p
3. CRM > (Select any opportunity with at least one message) > Mouse hover on elapsed time (e.g. "an hour ago")
Expected:
- It shows the customized time format (e.g. 11/07/2017 5:33:36 PM)
Results:
- It shows the military time format (e.g. Tue Nov 07 2017 17:33:36 GMT+0100)
opw-781647
Diffstat (limited to 'addons/mail/static/src/js/activity.js')
| -rw-r--r-- | addons/mail/static/src/js/activity.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/addons/mail/static/src/js/activity.js b/addons/mail/static/src/js/activity.js index a2ae24dff91..4d3d7adee50 100644 --- a/addons/mail/static/src/js/activity.js +++ b/addons/mail/static/src/js/activity.js @@ -20,8 +20,7 @@ var setDelayLabel = function(activities){ var today = moment().startOf('day'); _.each(activities, function(activity){ var to_display = ''; - var deadline = moment(activity.date_deadline + ' 00:00:00'); - var diff = deadline.diff(today, 'days', true); // true means no rounding + var diff = activity.date_deadline.diff(today, 'days', true); // true means no rounding if(diff === 0){ to_display = _t('Today'); }else{ @@ -72,10 +71,17 @@ var AbstractActivityField = AbstractField.extend({ }); } return $.when(fetch_def).then(function (results) { + // convert create_date and date_deadline to moments + _.each(results, function (activity) { + activity.create_date = moment(time.auto_str_to_date(activity.create_date)); + activity.date_deadline = moment(time.auto_str_to_date(activity.date_deadline)); + }); + // filter out activities that are no longer linked to this record self.activities = _.filter(self.activities.concat(results || []), function (activity) { return _.contains(self.value.res_ids, activity.id); }); + // sort activities by due date self.activities = _.sortBy(self.activities, 'date_deadline'); }); @@ -122,7 +128,6 @@ var Activity = AbstractActivityField.extend({ var fetch_def = this.dp.add(this._readActivities()); return fetch_def.then(function () { _.each(self.activities, function (activity) { - activity.time_ago = moment(time.auto_str_to_date(activity.create_date)).fromNow(); if (activity.note) { activity.note = utils.parse_and_transform(activity.note, utils.add_link); } @@ -135,6 +140,7 @@ var Activity = AbstractActivityField.extend({ nbPlannedActivities: nbActivities.planned, nbTodayActivities: nbActivities.today, nbOverdueActivities: nbActivities.overdue, + date_format: time.getLangDatetimeFormat(), })); } else { self.$el.empty(); |
