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

[FIX] email_template: fixed active_mode, active_id and active_ids. 

bzr revid: tde@openerp.com-20120716164825-dj5643lgo6fk6j3h
This commit is contained in:
Thibault Delavallée 2012-07-16 18:48:25 +02:00
parent f33b42b5cb
commit 21c9788aa7
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/email_template/wizard/mail_compose_message.py
View File

@ -27,7 +27,7 @@ from tools.translate import _
import tools
def _reopen(self,res_id,model):
def _reopen(self, id, res_id, model):
return {'type': 'ir.actions.act_window',
'view_mode': 'form',
'view_type': 'form',
@ -37,7 +37,11 @@ def _reopen(self,res_id,model):
# save original model in context, otherwise
# it will be lost on the action's context switch
'context': {'mail.compose.target.model': model}
'context': {'mail.compose.target.model': model,
'active_id': res_id,
'active_ids': [res_id],
'active_model': model,
}
}
class mail_compose_message(osv.osv_memory):
@ -114,14 +118,16 @@ class mail_compose_message(osv.osv_memory):
def template_toggle(self, cr, uid, ids, context=None):
for record in self.browse(cr, uid, ids, context=context):
had_template = record.use_template
print had_template
record.write({'use_template': not(had_template)})
if had_template:
# equivalent to choosing an empty template
onchange_defaults = self.on_change_template(cr, uid, record.id, not(had_template),
False, email_from=record.email_from,
email_to=record.email_to, context=context)
print onchange_defaults
record.write(onchange_defaults['value'])
return _reopen(self, record.id, record.model)
return _reopen(self, record.id, record.res_id, record.model)
def save_as_template(self, cr, uid, ids, context=None):
if context is None:

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

@ -96,8 +96,6 @@ class mail_compose_message(osv.TransientModel):
result['model'] = active_model
if not result.get('res_id') and active_id:
result['res_id'] = active_id
# if result['model'] == 'mail.message' and not result.get('parent_id'):
# result['parent_id'] = context.get('active_id')
# Try to provide default email_from if not specified yet
if not result.get('email_from'):