[MERGE] from trunk-patest-w45: date and timerelative with timezone
bzr revid: chm@openerp.com-20121203113044-p7xbxnva5kg9xbpu
This commit is contained in:
commit
96cd88b04c
|
@ -237,11 +237,9 @@ openerp.mail = function (session) {
|
||||||
|
|
||||||
/* Convert date, timerelative and avatar in displayable data. */
|
/* Convert date, timerelative and avatar in displayable data. */
|
||||||
format_data: function () {
|
format_data: function () {
|
||||||
|
|
||||||
//formating and add some fields for render
|
//formating and add some fields for render
|
||||||
if (this._date) {
|
if (this._date) {
|
||||||
this.date = session.web.format_value(this._date, {type:"datetime"});
|
this.timerelative = $.timeago(this._date+"Z");
|
||||||
this.timerelative = $.timeago(this.date);
|
|
||||||
}
|
}
|
||||||
if (this.type == 'email' && (!this.author_id || !this.author_id[0])) {
|
if (this.type == 'email' && (!this.author_id || !this.author_id[0])) {
|
||||||
this.avatar = ('/mail/static/src/img/email_icon.png');
|
this.avatar = ('/mail/static/src/img/email_icon.png');
|
||||||
|
|
Loading…
Reference in New Issue