diff options
Diffstat (limited to 'addons/mail/static/src')
| -rw-r--r-- | addons/mail/static/src/css/mail.css | 3 | ||||
| -rw-r--r-- | addons/mail/static/src/js/mail.js | 7 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 16 |
3 files changed, 16 insertions, 10 deletions
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index a4beca607ba..e4b7f9247e3 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -53,6 +53,9 @@ .openerp .oe_mail > .oe_thread{ margin-left: 0px; } +.openerp .oe_inline.oe_compose_recipients { + margin-top: -2px; +} /* ---------------- MESSAGES ------------------ */ diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 62e9241cf4f..35a6adfaaea 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -235,7 +235,7 @@ openerp.mail = function (session) { this.attachment_ids = datasets.attachment_ids || [], this.partner_ids = datasets.partner_ids || []; this.date = datasets.date; - + this.user_pid = datasets.user_pid || false; this.format_data(); // update record_name: Partner profile @@ -565,6 +565,7 @@ openerp.mail = function (session) { 'default_partner_ids': partner_ids, 'mail_post_autofollow': true, 'mail_post_autofollow_partner_ids': partner_ids, + 'is_private': self.is_private }; if (self.is_log) { _.extend(context, {'mail_compose_log': true}); @@ -773,7 +774,7 @@ openerp.mail = function (session) { // if clicked: call for suggested recipients if (event.type == 'click') { this.is_log = $input.hasClass('oe_compose_log'); - suggested_partners = this.parent_thread.ds_thread.call('message_get_suggested_recipients', [[this.context.default_res_id]]).done(function (additional_recipients) { + suggested_partners = this.parent_thread.ds_thread.call('message_get_suggested_recipients', [[this.context.default_res_id], this.context]).done(function (additional_recipients) { var thread_recipients = additional_recipients[self.context.default_res_id]; _.each(thread_recipients, function (recipient) { var parsed_email = mail.ChatterUtils.parse_email(recipient[1]); @@ -1239,9 +1240,9 @@ openerp.mail = function (session) { 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.user_pid = datasets.user_pid || false; this.partner_ids = datasets.partner_ids; this.messages = []; - this.options.flat_mode = (this.options.display_indented_thread - this.thread_level > 0); // object compose message diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 1be9754e1c7..e6c84eaa5df 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -121,21 +121,23 @@ To: <t t-if="!widget.is_private"> <span class="oe_all_follower"> - <t t-if="widget.parent_thread.parent_message.record_name" t-raw="'"' + widget.parent_thread.parent_message.record_name + '"'"> + <t t-if="widget.parent_thread.parent_message.record_name"> Followers of <t t-raw="'"' + widget.parent_thread.parent_message.record_name + '"'"/> </t> <t t-if="!widget.parent_thread.parent_message.record_name and widget.options.view_inbox">My Followers</t> <t t-if="!widget.parent_thread.parent_message.record_name and !widget.options.view_inbox">Followers of this document</t> </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&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+1"/> + <t t-if="widget.is_private or (widget.user_pid != partner[0])"> + <t t-if="!widget.is_private and inc==0"> and </t> + <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&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+1"/> + </t> </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> |