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

[IMP] Portal: generate_portal_url -> generate_signin_url; slughty udpated portal tests to 1. test the generated URL 2. consider it is correct for future tests.

Browse Source 
bzr revid: tde@openerp.com-20120913161226-y02gg43lua10s0k4
This commit is contained in:
Thibault Delavallée
2012-09-13 18:12:26 +02:00
parent e4e21105b2
commit 4efde28e55
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/portal/mail_mail.py
+3 -3
View File
@@ -29,8 +29,8 @@ class mail_mail_portal(osv.Model):
_name = 'mail.mail'
_inherit = ['mail.mail']
def _generate_portal_url(self, cr, uid, partner_id, portal_group_id, key, context=None):
""" . """
def _generate_signin_url(self, cr, uid, partner_id, portal_group_id, key, context=None):
""" Generate the signin url """
base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='', context=context)
return base_url + '/login?action=signin&partner_id=%s&group=%s&key=%s' % (partner_id, portal_group_id, key)
@@ -45,7 +45,7 @@ class mail_mail_portal(osv.Model):
if partner:
portal_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal', 'portal')
portal_id = portal_ref and portal_ref[1] or False
url = self._generate_portal_url(cr, uid, partner.id, portal_id, 1234, context=context)
url = self._generate_signin_url(cr, uid, partner.id, portal_id, 1234, context=context)
body = tools.append_content_to_html(mail.body_html, url)
return body
else:
addons/portal/tests/test_portal.py
+10 -3
View File
@@ -51,12 +51,19 @@ class test_portal(test_mail.TestMailMockups):
p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
# ----------------------------------------
# CASE1: invite Bert
# CASE1: generated URL
# ----------------------------------------
url = self.mail_mail._generate_signin_url(cr, uid, p_b_id, portal_id, 1234)
self.assertEqual(url, base_url + '/login?action=signin&partner_id=%s&group=%s&key=%s' % (p_b_id, portal_id, 1234),
'generated signin URL incorrect')
# ----------------------------------------
# CASE2: invite Bert
# ----------------------------------------
_sent_email_subject = 'Invitation to follow Pigs'
_sent_email_body = append_content_to_html('<div>You have been invited to follow Pigs.</div>',
base_url + '/login?action=signin&partner_id=%s&group=%s&key=%s' % (p_b_id, portal_id, 1234))
_sent_email_body = append_content_to_html('<div>You have been invited to follow Pigs.</div>', url)
# Do: create a mail_wizard_invite, validate it
self._init_mock_build_email()