diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-08-30 16:35:49 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-08-30 16:35:49 +0200 |
| commit | 00fc7d1e88ddba7633ebc850f23c34a2ea858fe7 (patch) | |
| tree | 75a00fe43949db5d999e14eeaaa840aa470cfe39 /addons/mail/wizard/mail_compose_message_view.xml | |
| parent | 1dce0b1dc4a8c206b4c91de3cb85900fa1634645 (diff) | |
[IMP] mail.compose.message: added basic mass_mail support back. Moved generation into a dedicated method, to be inherited in email_template. Added somes tests in mail to test mass_mailing without email_template.
bzr revid: tde@openerp.com-20120830143549-33sgtd30asvztg2c
Diffstat (limited to 'addons/mail/wizard/mail_compose_message_view.xml')
| -rw-r--r-- | addons/mail/wizard/mail_compose_message_view.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index 8bf8df24f59..4ce5db3f4e3 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -7,6 +7,7 @@ <field name="arch" type="xml"> <form string="Compose Email" version="7.0"> <group> + <field name="composition_mode" invisible="1"/> <field name="model" invisible="1"/> <field name="res_id" invisible="1"/> <field name="author_id"/> @@ -38,11 +39,11 @@ <field name="arch" type="xml"> <form string="Compose Email" version="7.0" > <group> + <!-- truly invisible fields for control and options --> <field name="composition_mode" colspan="2" nolabel="1" invisible="1"/> <field name="model" colspan="2" nolabel="1" invisible="1"/> <field name="res_id" colspan="2" nolabel="1" invisible="1"/> <field name="parent_id" colspan="2" nolabel="1" invisible="1"/> - <!-- truly invisible fields for control and options --> <field name="content_subtype" colspan="2" nolabel="1" invisible="1"/> <!-- visible wizard --> <field name="subject" colspan="2" nolabel="1" placeholder="Subject..." @@ -63,14 +64,15 @@ class="oe_mail_compose_message_attachment_ids"/> <!-- void div to display attachments, Chatter-controlled --> <div colspan="2" class="oe_mail_compose_message_attachments"/> - <!-- buttons, mostly Chatter-controlled --> + <!-- buttons, with as few Chatter logic as possible --> <div> <button name="send_mail" string="Post" type="object" class="oe_mail_compose_message_button_send"/> </div> <div class='oe_mail_compose_message_icons'> - <button icon="/mail/static/src/img/attachment.png" name="dummy" + <button icon="/mail/static/src/img/attachment.png" class="oe_mail_compose_message_attachment" string="" + name="dummy" help="Add an attachment"/> <button icon="/mail/static/src/img/formatting.png" class="oe_mail_compose_message_formatting" string="" @@ -100,6 +102,6 @@ target="new" key2="client_action_multi" id="base.action_partner_mass_mail" - context="{'mail.compose.message.mode':'mass_mail'}"/> + context="{'default_composition_mode': 'mass_mail'}"/> </data> </openerp> |