diff options
Diffstat (limited to 'addons/mail/static/src')
| -rw-r--r-- | addons/mail/static/src/js/thread.js | 14 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 4 |
2 files changed, 16 insertions, 2 deletions
diff --git a/addons/mail/static/src/js/thread.js b/addons/mail/static/src/js/thread.js index 00f7a44f1b1..55acfc00f9d 100644 --- a/addons/mail/static/src/js/thread.js +++ b/addons/mail/static/src/js/thread.js @@ -234,6 +234,20 @@ var Thread = Widget.extend({ msg.day = msg.date.format('LL'); } + 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; } diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index df1dfadb04d..9896cb0ce6e 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -138,10 +138,10 @@ <li> <t t-esc="value.changed_field"/>: <t t-if="value.old_value"> - <span> <t t-esc="value.old_value"/> </span> + <span> <t t-esc="value.old_value || ((value.field_type !== 'boolean') and '')"/> </span> <span class="fa fa-long-arrow-right"/> </t> - <span> <t t-esc="value.new_value"/> </span> + <span> <t t-esc="value.new_value || ((value.field_type !== 'boolean') and '')"/> </span> </li> </t> </ul> |