[FIX] mail.compose.message: fixed rendering when no template is chosen in the selection box; also cleaned display of recipients when using the wizard in mass mailing mode.

bzr revid: tde@openerp.com-20121211155435-l5s9lpghpxw8bi9o

1 files changed, 5 insertions, 2 deletions

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 57fc0aaf729..c0b329690e3 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -15,14 +15,17 @@
                         <!-- visible wizard -->
                         <label for="partner_ids" string="Recipients"/>
                         <div>
-                            <span attrs="{'invisible':[('model', '=', False)]}">
+                            <span attrs="{'invisible':['|', ('model', '=', False), ('composition_mode', '!=', 'mass_mail')]}">
+                                Followers of selected items and
+                            </span>
+                            <span attrs="{'invisible':['|', ('model', '=', False), ('composition_mode', '=', 'mass_mail')]}">
                                 Followers of
                                 <field name="record_name" readonly="1" class="oe_inline"
                                     attrs="{'invisible':[('model', '=', False)]}"/>
                                 and 
                             </span>
                             <field name="partner_ids" widget="many2many_tags_email" placeholder="Add contacts to notify..."
-                                context="{'force_email':True}" required="1"/>
+                                context="{'force_email':True}"/>
                         </div>
                         <field name="subject" placeholder="Subject..."/>
                     </group>