diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-06-06 12:24:37 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-06-06 12:24:37 +0200 |
| commit | 9c57f6e1cdaf8a80a403486b51cd9e661c11e3dc (patch) | |
| tree | 8d590216aa371067d8e8135fc5c5bf9d202be70b /addons/mail/static/src/xml/mail.xml | |
| parent | 9fd2e7297ffb0fe9cb96767bcb8ad686a66d064b (diff) | |
[FIX] mail: various fixes
Mass mailing: emails due to mass mailing are not queued instead of sent immediately.
As most of cases go through mail_followers._notify(), a new argument is added that
allows to control the force_send (like what is done in email_template).
Chatter: better display of recipients when having a message_post due to mass mailing
(not always displaying logged a note).
Notified people: when having no subtype, just avoid notifying the followers but
take into account specified recipients (partner_ids).
bzr revid: tde@openerp.com-20130606102437-43s4xp96b5wa3r1q
Diffstat (limited to 'addons/mail/static/src/xml/mail.xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index b3b79bcfc43..8c507925359 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -271,16 +271,16 @@ <span class='oe_subtle'>•</span> </t> </t> - <t t-if="widget.type == 'comment' and ! widget.subtype"> + <t t-if="widget.type == 'comment' and ! widget.subtype and widget.partner_ids.length == 0"> logged a note </t> - <t t-if="(widget.type == 'comment' or widget.type == 'email') and widget.subtype"> + <t t-if="(widget.type == 'comment' or widget.type == 'email') and (widget.subtype or widget.partner_ids.length > 0)"> to <t t-if="widget.partner_ids.length == 0"> nobody </t> </t> - <t t-if="widget.type == 'notification' or ( (widget.type == 'email' or widget.type == 'comment') and widget.subtype)" + <t t-if="widget.type == 'notification' or ( (widget.type == 'email' or widget.type == 'comment') and (widget.subtype or widget.partner_ids.length > 0))" t-foreach="widget.partner_ids.slice(0, 3)" t-as="partner"> <span t-attf-class="oe_partner_follower"> <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&id=#{partner[0]}"><t t-raw="partner[1]"/></a> |