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

[IMP] mail.js, xml: misc cleaning. I hate JS. 

bzr revid: tde@openerp.com-20121221153007-5o220hdqg9sbt3f3
This commit is contained in:
Thibault Delavallée 2012-12-21 16:30:07 +01:00
parent d28418f6e4
commit f9763f5d05
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1055,9 +1055,11 @@ openerp.mail = function (session) {
this.is_private = datasets.is_private || false;
this.author_id = datasets.author_id || false;
this.thread_level = (datasets.thread_level+1) || 0;
this.partner_ids = datasets.partner_ids || [];
if (datasets.author_id && datasets.author_id[0])
this.partner_ids.push(datasets.author_id);
datasets.partner_ids = datasets.partner_ids || [];
if (datasets.author_id && ! _.contains(datasets.partner_ids, datasets.author_id) && datasets.author_id[0]) {
datasets.partner_ids.push(datasets.author_id);
}
this.partner_ids = datasets.partner_ids;
this.messages = [];
this.options.flat_mode = !!(this.options.display_indented_thread > this.thread_level ? this.options.display_indented_thread - this.thread_level : 0);

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

@ -114,11 +114,13 @@
</span>
</t>
<t t-if="!widget.is_private and (widget.partner_ids.length or (widget.author_id and widget.author_id[0]))"> and </t>
<t t-set="inc" t-value="0"/>
<t t-foreach="widget.partner_ids" t-as="partner">
<span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
<a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
<t t-if="!widget.options.show_link" t-raw="partner[1]"/>
</span><t t-set="inc" t-value="(inc or 0)+1"/>
</span>
<t t-set="inc" t-value="inc+1"/>
</t>
<t t-if="widget.partner_ids.length > 3">
<span class="oe_more">, <a><t t-raw="widget.partner_ids.length - 3"/> others...</a></span>