From 439b35d9ed6779980044f20986986879e88fa58c Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Thu, 7 Mar 2013 18:54:46 +0530 Subject: [PATCH 01/14] [IMP] email_template:make template_id field many2one from selection and aplly domain of related model, improve view of email_template bzr revid: tpa@tinyerp.com-20130307132446-gsb9yp32o7fnomco --- addons/email_template/email_template_view.xml | 9 ++++----- .../wizard/mail_compose_message.py | 20 +------------------ .../wizard/mail_compose_message_view.xml | 4 ++-- 3 files changed, 7 insertions(+), 26 deletions(-) diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml index 4cddb31c8e1..489751ad697 100644 --- a/addons/email_template/email_template_view.xml +++ b/addons/email_template/email_template_view.xml @@ -35,7 +35,7 @@ - + @@ -46,9 +46,10 @@ + - + @@ -56,9 +57,7 @@ - - - + diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py index b39ed4e5639..aae11c039a2 100644 --- a/addons/email_template/wizard/mail_compose_message.py +++ b/addons/email_template/wizard/mail_compose_message.py @@ -39,26 +39,8 @@ def _reopen(self, res_id, model): class mail_compose_message(osv.TransientModel): _inherit = 'mail.compose.message' - def _get_templates(self, cr, uid, context=None): - if context is None: - context = {} - model = False - email_template_obj = self.pool.get('email.template') - message_id = context.get('default_parent_id', context.get('message_id', context.get('active_id'))) - - if context.get('default_composition_mode') == 'reply' and message_id: - message_data = self.pool.get('mail.message').browse(cr, uid, message_id, context=context) - if message_data: - model = message_data.model - else: - model = context.get('default_model', context.get('active_model')) - - record_ids = email_template_obj.search(cr, uid, [('model', '=', model)], context=context) - return email_template_obj.name_get(cr, uid, record_ids, context) + [(False, '')] - _columns = { - # incredible hack of the day: size=-1 means we want an int db column instead of an str one - 'template_id': fields.selection(_get_templates, 'Template', size=-1), + 'template_id': fields.many2one('email.template', 'Use template',select=True), } def onchange_template_id(self, cr, uid, ids, template_id, composition_mode, model, res_id, context=None): diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml index 34a2112e1ac..0f57c8d2a79 100644 --- a/addons/email_template/wizard/mail_compose_message_view.xml +++ b/addons/email_template/wizard/mail_compose_message_view.xml @@ -10,8 +10,8 @@
Use template - +