odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] mail: use session.web.str_to_datetime instead of Date.parse 

bzr revid: chm@openerp.com-20130201093018-24yiklef5bni6ya1
This commit is contained in:
Christophe Matthieu 2013-02-01 10:30:18 +01:00
parent 5857bedb93
commit 3843ebd45b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/mail/static/src/js/mail.js
View File

@ -243,8 +243,9 @@ openerp.mail = function (session) {
/* Convert date, timerelative and avatar in displayable data. */
format_data: function () {
//formating and add some fields for render
if (this.date && new Date().getTime()-Date.parse((this.date+'').split('.')[0]).getTime() < 7*24*60*60*1000) {
this.timerelative = $.timeago(this.date+"Z");
this.date = this.date ? session.web.str_to_datetime(this.date) : false;
if (this.date && new Date().getTime()-this.date.getTime() < 7*24*60*60*1000) {
this.timerelative = $.timeago(this.date);
}
if (this.type == 'email' && (!this.author_id || !this.author_id[0])) {
this.avatar = ('/mail/static/src/img/email_icon.png');