diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-03-29 11:51:16 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-03-29 11:51:16 +0100 |
| commit | 07a46db2cb5cae22616ffcee01a9e3985fddf37b (patch) | |
| tree | 46c1bdb08f67a7d64bc9f7baab154735c0b096e9 | |
| parent | 97bba88a53a3ad47bc07d2f952bcb8b4d72acf55 (diff) | |
| parent | c6bf1f1af33200804b2efbf1220d79d82daf446b (diff) | |
[MERGE] [FIX] Chatter:
- message date was wrong for records created from incoming email servers.
- fix the (only visual) duplication of partners in the 'To' of quick reply widget
- fixed empty list message appearing twice when quickly clicking on 'read'
bzr revid: tde@openerp.com-20130329105116-7ocxb9cn9f1h7yi6
| -rw-r--r-- | addons/mail/mail_thread.py | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/js/mail.js | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 5bdd7b93870..8808995af4b 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -809,7 +809,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.', diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 1eeab9bb30d..f992a385c3e 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -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); + } }, /** |