projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
68e0b2a
)
[FIX] mail: remove deprecation warning when converting a non Date object into moment
author
Cedric Snauwaert
<csn@openerp.com>
Fri, 28 Nov 2014 14:20:30 +0000
(15:20 +0100)
committer
Cedric Snauwaert
<csn@openerp.com>
Fri, 28 Nov 2014 14:20:30 +0000
(15:20 +0100)
addons/mail/static/src/js/mail.js
patch
|
blob
|
history
diff --git
a/addons/mail/static/src/js/mail.js
b/addons/mail/static/src/js/mail.js
index
46e1cea
..
62268de
100644
(file)
--- a/
addons/mail/static/src/js/mail.js
+++ b/
addons/mail/static/src/js/mail.js
@@
-218,7
+218,7
@@
openerp.mail = function (session) {
//formating and add some fields for render
this.date = this.date ? session.web.str_to_datetime(this.date) : false;
- this.display_date = moment(this.date).format('ddd MMM DD YYYY LT');
+ this.display_date = moment(new Date(this.date)).format('ddd MMM DD YYYY LT');
if (this.date && new Date().getTime()-this.date.getTime() < 7*24*60*60*1000) {
this.timerelative = $.timeago(this.date);
}