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

[IMP] all: unified context params for mail composition wizard 

A single common `mail.compose.message.mode` key is now
used in the context, avoiding name collisions and being
more consistent.

bzr revid: odo@openerp.com-20110906093228-itbilwzpv4wl07j9
This commit is contained in:
Olivier Dony 2011-09-06 11:32:28 +02:00
parent f42126df0e
commit 1db8e54425
12 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/crm/crm_lead_view.xml
View File

@ -181,7 +181,7 @@
<button
string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply', 'message_id':active_id}"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="History">
@ -203,7 +203,7 @@
<group attrs="{'invisible': [('email_from', '=', False)]}">
<button colspan="4" string="Reply"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply'}"
context="{'mail.compose.message.mode':'reply'}"
icon="terp-mail-replied" type="action"/>
</group>
@ -497,7 +497,7 @@
<button
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
context="{'mail.compose.message.mode':'reply', 'model': 'crm.lead', 'include_original' : True}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="History">
@ -518,7 +518,7 @@
<button colspan="4"
string="Reply"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
context="{'mail.compose.message.mode':'reply', 'model': 'crm.lead', 'include_original' : True}"
icon="terp-mail-replied" type="action" />
</group>

4
addons/crm_claim/crm_claim_view.xml
View File

@ -157,7 +157,7 @@
<button
string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply'}"
context="{'mail.compose.message.mode':'reply'}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="Communication &amp; History">
@ -174,7 +174,7 @@
<field name="body_text" colspan="4" nolabel="1" height="250"/>
<button colspan="4" string="Reply"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply', 'message_id':active_id}"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action"/>
</group>
<group attrs="{'invisible': [('email_from', '!=', False)]}">

4
addons/crm_fundraising/crm_fundraising_view.xml
View File

@ -142,7 +142,7 @@
<button
string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply', 'message_id':active_id}"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="History">
@ -159,7 +159,7 @@
<field name="body_text" colspan="4" nolabel="1" height="250"/>
<button colspan="4" string="Reply"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply', 'message_id':active_id}"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action"/>
</group>
<group attrs="{'invisible': [('email_from', '!=', False)]}">

4
addons/crm_helpdesk/crm_helpdesk_view.xml
View File

@ -102,7 +102,7 @@
<button
string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply', 'message_id':active_id}"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="History">
@ -119,7 +119,7 @@
<field name="body_text" colspan="4" nolabel="1" height="250"/>
<button colspan="4" string="Reply"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply', 'message_id':active_id}"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action"/>
</group>
<group attrs="{'invisible': [('email_from', '!=', False)]}">

2
addons/email_template/email_template.py
View File

@ -172,7 +172,7 @@ class email_template(osv.osv):
'res_model': 'mail.compose.message',
'src_model': src_obj,
'view_type': 'form',
'context': "{'mass_mail':True}",
'context': "{'mail.compose.message.mode':'mass_mail'}",
'view_mode':'form,tree',
'view_id': res_id,
'target': 'new',

4
addons/event/event_view.xml
View File

@ -394,7 +394,7 @@
<button
string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply', 'message_id':active_id}"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="History">
@ -411,7 +411,7 @@
<field name="body_text" colspan="4" nolabel="1" height="250"/>
<button colspan="4" string="Reply"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply', 'message_id':active_id}"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action"/>
</group>
<group attrs="{'invisible': [('email_from', '!=', False)]}">

2
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -417,7 +417,7 @@
view_type="form" view_mode="form"
target="new" multi="True"
key2="client_action_multi"
context="{'mass_mail':True}"/>
context="{'mail.compose.message.mode':'mass_mail'}"/>
<!-- Evaluation Interviews Button on Employee Form -->
<act_window

4
addons/hr_recruitment/hr_recruitment_view.xml
View File

@ -150,7 +150,7 @@
<button
string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply', 'message_id':active_id}"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="History">
@ -167,7 +167,7 @@
<field name="body" colspan="4" nolabel="1" height="250"/>
<button colspan="4" string="Reply"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply', 'message_id':active_id}"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action"/>
</group>
<group attrs="{'invisible': [('email_from', '!=', False)]}">

2
addons/mail/mail_message_view.xml
View File

@ -49,7 +49,7 @@
<field name="state" colspan="2"/>
<group col="4" colspan="2">
<button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
context="{'mail':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
<button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/>
<button name="mark_outgoing" string="Retry" type="object" icon="gtk-redo" states='exception,cancel'/>
<button name="cancel" string="Cancel" type="object" icon="terp-gtk-stop" states='outgoing'/>

40
addons/mail/wizard/mail_compose_message.py
View File

@ -39,19 +39,21 @@ class mail_compose_message(osv.osv_memory):
The behavior of the wizard can be modified through the use of context
parameters, among which are:
* mass_mail: turns multi-recipient mode on, where the mail details can
contain template placeholders that will be merged with
actual data before being sent to each recipient, as
determined via ``context['active_model']`` and
* mail.compose.message.mode: if set to 'reply', the wizard is in
reply mode and pre-populated with the original quote.
If set to 'mass_mail', the wizard is in mass mailing
where the mail details can contain template placeholders
that will be merged with actual data before being sent
to each recipient. Recipients will be derived from the
records determined via ``context['active_model']`` and
``context['active_ids']``.
* mail: if set to 'reply', the wizard will be in mail reply mode
* active_model: model name of the document to which the mail being
composed is related
* active_id: id of the document to which the mail being composed is
related, or id of the message to which user is replying,
in case mail == 'reply'.
in case ``mail.compose.message.mode == 'reply'``
* active_ids: ids of the documents to which the mail being composed is
related, in case ``context['mass_mail']`` is set.
related, in case ``mail.compose.message.mode == 'mass_mail'``.
"""
_name = 'mail.compose.message'
_inherit = 'mail.message.common'
@ -68,11 +70,17 @@ class mail_compose_message(osv.osv_memory):
context = {}
result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
vals = {}
if context.get('active_model') and context.get('active_id') and not context.get('mail') == 'reply':
reply_mode = context.get('mail.compose.message.mode') == 'reply'
if (not reply_mode) and context.get('active_model') and context.get('active_id'):
# normal mode when sending an email related to any document, as specified by
# active_model and active_id in context
vals = self.get_value(cr, uid, context.get('active_model'), context.get('active_id'), context)
elif context.get('mail') == 'reply' and context.get('active_id'):
elif reply_mode and context.get('active_id'):
# reply mode, consider active_id is the ID of a mail.message to which we're
# replying
vals = self.get_message_data(cr, uid, int(context['active_id']), context)
else:
# default mode
result['model'] = context.get('active_model', False)
if vals:
for field in fields:
@ -108,7 +116,7 @@ class mail_compose_message(osv.osv_memory):
"""Returns a defaults-like dict with initial values for the composition
wizard when replying to the given message (e.g. including the quote
of the initial message, and the correct recipient).
Should not be called unless ``context['mail'] == 'reply'``.
Should not be called unless ``context['mail.compose.message.mode'] == 'reply'``.
:param int message_id: id of the mail.message to which the user
is replying.
@ -128,7 +136,7 @@ class mail_compose_message(osv.osv_memory):
# as it is easier to quote than the HTML version.
# XXX TODO: make it possible to switch to HTML on the fly
body = message_data.body_text or ''
if context.get('mail') == 'reply':
if context.get('mail.compose.message.mode') == 'reply':
header = _('-------- Original Message --------')
sender = _('From: %s') % tools.ustr(message_data.email_from or '')
email_to = _('To: %s') % tools.ustr(message_data.email_to or '')
@ -162,9 +170,9 @@ class mail_compose_message(osv.osv_memory):
def send_mail(self, cr, uid, ids, context=None):
'''Process the wizard contents and proceed with sending the corresponding
email(s), rendering any template patterns on the fly if needed.
If the wizard is in mass-mail mode (context has a ``mass_mail`` key),
the resulting email(s) are scheduled for being sent the next time
the mail.message scheduler runs, or the next time
If the wizard is in mass-mail mode (context['mail.compose.message.mode'] is
set to ``'mass_mail'``), the resulting email(s) are scheduled for being
sent the next time the mail.message scheduler runs, or the next time
``mail.message.process_email_queue`` is called.
Otherwise the new message is sent immediately.
@ -184,11 +192,11 @@ class mail_compose_message(osv.osv_memory):
body = mail.body_html if mail.subtype == 'html' else mail.body_text
# Reply Email
if context.get('mail') == 'reply' and mail.message_id:
if context.get('mail.compose.message.mode') == 'reply' and mail.message_id:
references = (mail.references or '') + " " + mail.message_id
headers['In-Reply-To'] = mail.message_id
if context.get('mass_mail'):
if context.get('mail.compose.message.mode') == 'mass_mail':
# Mass mailing: must render the template patterns
if context.get('active_ids') and context.get('active_model'):
active_ids = context['active_ids']

2
addons/mail/wizard/mail_compose_message_view.xml
View File

@ -54,6 +54,6 @@
target="new"
key2="client_action_multi"
id="base.action_partner_mass_mail"
context="{'mass_mail':True}"/>
context="{'mail.compose.message.mode':'mass_mail'}"/>
</data>
</openerp>

4
addons/project_issue/project_issue_view.xml
View File

@ -103,7 +103,7 @@
<button
string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply', 'message_id':active_id}"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="History">
@ -120,7 +120,7 @@
<field name="body_text" colspan="4" nolabel="1" height="250"/>
<button colspan="4" string="Reply"
name="%(mail.action_email_compose_message_wizard)d"
context="{'mail':'reply', 'message_id':active_id}"
context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
icon="terp-mail-replied" type="action"/>
</group>
<group attrs="{'invisible': [('email_from', '!=', False)]}">