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

[FIX]: mail chatter issue 

bzr revid: aja@tinyerp.com-20130321125508-ixlskc9rnnalwcwl
This commit is contained in:
ajay javiya (OpenERP) 2013-03-21 18:25:08 +05:30
parent bfbdd94fa8
commit 8ecb77a59d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mail/mail_thread.py
View File

@ -794,7 +794,7 @@ class mail_thread(osv.AbstractModel):
# as RFC2822 requires timezone offset in Date headers.
stored_date = parsed_date.replace(tzinfo=pytz.utc)
else:
stored_date = parsed_date.astimezone(pytz.utc)
stored_date = parsed_date.astimezone(tzinfo=pytz.utc)
except Exception:
_logger.warning('Failed to parse Date header %r in incoming mail '
'with message-id %r, assuming current date/time.',

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

@ -1208,7 +1208,7 @@ openerp.mail = function (session) {
this.author_id = datasets.author_id || false;
this.thread_level = (datasets.thread_level+1) || 0;
datasets.partner_ids = datasets.partner_ids || [];
if (datasets.author_id && ! _.contains(datasets.partner_ids, datasets.author_id) && datasets.author_id[0]) {
if (datasets.author_id && !_.contains(_.flatten(datasets.partner_ids),datasets.author_id[0]) && datasets.author_id[0]) {
datasets.partner_ids.push(datasets.author_id);
}
this.partner_ids = datasets.partner_ids;
@ -1389,7 +1389,10 @@ openerp.mail = function (session) {
if (this.options.help) {
no_message.html(this.options.help);
}
no_message.appendTo(this.$el);
if (!this.$el.find(".oe_view_nocontent").length)
{
no_message.appendTo(this.$el);
}
},
/**