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

[MERGE] from trunk-patest-w45: date and timerelative with timezone 

bzr revid: chm@openerp.com-20121203113044-p7xbxnva5kg9xbpu
This commit is contained in:
Christophe Matthieu 2012-12-03 12:30:44 +01:00
parent 7afd9783e8 3cebd09f9c
commit 96cd88b04c
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,11 +237,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) {
this.date = session.web.format_value(this._date, {type:"datetime"});
this.timerelative = $.timeago(this.date);
this.timerelative = $.timeago(this._date+"Z");
}
if (this.type == 'email' && (!this.author_id || !this.author_id[0])) {
this.avatar = ('/mail/static/src/img/email_icon.png');