pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Still fixing attachments through templates.

Browse Source 
bzr revid: tde@openerp.com-20130228145513-6g30ujr3cm0j8b3u
This commit is contained in:
Thibault Delavallée
2013-02-28 15:55:13 +01:00
parent d6fcee5a4f
commit aa865c8b61
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/email_template/tests/test_mail.py
+4 -4
View File
@@ -48,8 +48,8 @@ class test_message_compose(TestMailBase):
_body_html1 = 'Fans of Pigs, unite !'
_body_html2 = 'I am angry !'
_attachments = [
{'name': 'First', 'datas_fname': 'first.txt', 'datas': base64.b64encode('My first attachment'), 'res_model': 'dummy.model'},
{'name': 'Second', 'datas_fname': 'second.txt', 'datas': base64.b64encode('My second attachment'), 'res_model': 'dummy.model'}
{'name': 'First', 'datas_fname': 'first.txt', 'datas': base64.b64encode('My first attachment'), 'res_model': 'mail.group', 'res_id': self.group_pigs_id},
{'name': 'Second', 'datas_fname': 'second.txt', 'datas': base64.b64encode('My second attachment'), 'res_model': 'mail.group', 'res_id': self.group_pigs_id}
]
_attachments_test = [('first.txt', 'My first attachment'), ('second.txt', 'My second attachment')]
@@ -118,9 +118,9 @@ class test_message_compose(TestMailBase):
# Test: mail.compose.message: attachments
# Test: mail.message: attachments
for attach in compose.attachment_ids:
self.assertEqual(attach.res_model, 'dummy.model', 'mail.message attachment res_model through templat was overriden')
self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model through templat was overriden')
self.assertEqual(attach.res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
self.assertIn((attach.name, base64.b64decode(attach.datas)), _attachments_test,
self.assertIn((attach.datas_fname, base64.b64decode(attach.datas)), _attachments_test,
'mail.message attachment name / data incorrect')
# ----------------------------------------
addons/mail/wizard/mail_compose_message.py
+1 -1
View File
@@ -214,7 +214,7 @@ class mail_compose_message(osv.TransientModel):
new_partner_ids = email_dict.pop('partner_ids', [])
post_values['partner_ids'] += [(4, partner_id) for partner_id in new_partner_ids]
new_attachment_ids = email_dict.pop('attachment_ids', [])
post_values['attachments'] += new_attachment_ids
post_values['attachment_ids'] += [(4, attach_id) for attach_id in new_attachment_ids]
new_attachments = email_dict.pop('attachments', [])
post_values['attachments'] += new_attachments
post_values.update(email_dict)