diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-04-08 14:40:53 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-04-08 14:40:53 +0200 |
| commit | 8178669795e987c9b3df7eec7712f2f6cd1fba47 (patch) | |
| tree | 8127640054563850d4781b619ed68d9857203630 /addons/website_mail | |
| parent | cbfc26fe77d6cc216b47e4fbe08727b6cb511847 (diff) | |
[FIX] mail, mass_mailing
- mail: now trigger postprocess_sent_message in every case, being sent or not, as the state
is propagated in the method; udpated all addons accordingly;
- email_template: fixed URL to edit it in website + form view;
- mass_mailing: barchart now send jsonified value;
- mass_mailing: tweaking the form view with all options
bzr revid: tde@openerp.com-20140408124053-o9tb14k6v47s5mjd
Diffstat (limited to 'addons/website_mail')
| -rw-r--r-- | addons/website_mail/models/email_template.py | 2 | ||||
| -rw-r--r-- | addons/website_mail/views/email_template_view.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/website_mail/models/email_template.py b/addons/website_mail/models/email_template.py index 87daac6aabb..64beacea835 100644 --- a/addons/website_mail/models/email_template.py +++ b/addons/website_mail/models/email_template.py @@ -27,7 +27,7 @@ class EmailTemplate(osv.Model): _inherit = 'email.template' def _get_website_link(self, cr, uid, ids, name, args, context=None): - return dict((id, _('<a href="website_mail/email_designer/%s">Open with visual editor</a>') % id) for id in ids) + return dict((id, _('<a href="website_mail/email_designer?model=email.template&res_id=%d">Open with visual editor</a>') % id) for id in ids) _columns = { 'website_link': fields.function( diff --git a/addons/website_mail/views/email_template_view.xml b/addons/website_mail/views/email_template_view.xml index bb346af5e97..295002a98e7 100644 --- a/addons/website_mail/views/email_template_view.xml +++ b/addons/website_mail/views/email_template_view.xml @@ -6,7 +6,7 @@ <field name="model">email.template</field> <field name="inherit_id" ref="email_template.email_template_form"/> <field name="arch" type="xml"> - <xpath expr="//field[@name='model']" position="before"> + <xpath expr="//h1" position="after"> <br /> <field name="website_link" widget='html' radonly='1' style='margin: 0px; padding: 0px;'/> |