pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mail: preprocess tracking fields of type date/datetime only once

Browse Source 
Before this commit, if a message thread was loaded 2 times, the first time
the date was well formatted, the second time that fail because momentjs cannot
parse the localized date from some locale.

Luckily, it was not bugged by default in english, because moment was able to
reparse a localized US date. But in some local as french, momentjs cannot parse
the localized date and return 'Invalid date'

Now, we move the code, to be processed only once by the chat manager, and not
in each process of the thread.

This commit closes issue #13258

Courtesy of @aab-odoo
This commit is contained in:
Jeremy Kersten
2016-08-23 15:23:20 +02:00
parent 6d4bb4f18c
commit 1b2dab3f50
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/js/chat_manager.js
+16
View File
@@ -282,6 +282,22 @@ function make_message (data) {
a.url = '/web/content/' + a.id + '?download=true';
});
// format date to the local only once by message
// can not be done in preprocess, since it alter the original value
if (msg.tracking_value_ids && msg.tracking_value_ids.length) {
_.each(msg.tracking_value_ids, function(f) {
if (_.contains(['date', 'datetime'], f.field_type)) {
var format = (f.field_type === 'date') ? 'LL' : 'LLL';
if (f.old_value) {
f.old_value = moment.utc(f.old_value).local().format(format);
}
if (f.new_value) {
f.new_value = moment.utc(f.new_value).local().format(format);
}
}
});
}
return msg;
}
addons/mail/static/src/js/thread.js
-14
View File
@@ -151,20 +151,6 @@ var Thread = Widget.extend({
msg.hour = msg.date.format('LT');
}
if (message.tracking_value_ids && message.tracking_value_ids.length) {
_.each(message.tracking_value_ids, function(f) {
if (_.contains(['date', 'datetime'], f.field_type)) {
var format = (f.field_type === 'date') ? 'LL' : 'LLL';
if (f.old_value) {
f.old_value = moment.utc(f.old_value).local().format(format);
}
if (f.new_value) {
f.new_value = moment.utc(f.new_value).local().format(format);
}
}
});
}
if (_.contains(this.expanded_msg_ids, message.id)) {
msg.expanded = true;
}