diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:59:39 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:59:39 +0200 |
| commit | dda0d3d62d23cae3013db32bcb6322a2574f0162 (patch) | |
| tree | 0988c2ec35a0ac435f7faf51f69e762ecd93414e /addons/mail/static/src/js/thread.js | |
| parent | dcc13079b7fd02d156ffc982cddfccfe684113bc (diff) | |
| parent | baf494c67ba7ecba331b24bcfa5eed9bde8a16da (diff) | |
[MERGE] forward port of branch saas-10 up to baf494c
# Conflicts:
# addons/hr_timesheet/project_timesheet.py
# addons/sale_layout/i18n/es_PE.po
# addons/sale_layout/i18n/hu.po
# addons/sale_layout/i18n/lo.po
# addons/sale_layout/i18n/pl.po
# addons/sale_service/i18n/es_MX.po
# addons/sale_service/i18n/es_PE.po
# addons/sale_service/i18n/lo.po
# addons/stock/stock.py
# addons/stock/stock_view.xml
# addons/warning/i18n/es_PE.po
# addons/warning/i18n/lo.po
# addons/warning/i18n/ru.po
# addons/web/i18n/cs.po
# addons/web/i18n/ja.po
# addons/web/i18n/lo.po
# addons/web/i18n/th.po
Diffstat (limited to 'addons/mail/static/src/js/thread.js')
| -rw-r--r-- | addons/mail/static/src/js/thread.js | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/addons/mail/static/src/js/thread.js b/addons/mail/static/src/js/thread.js index ea593d21dfa..17b21c39a5b 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; } |