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

[FIX] survey: use relative urls for url actions

This commit is contained in:
Christophe Simonis 2014-08-07 16:56:40 +02:00
parent 9363dfe1ef
commit d5e8b42690
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
addons/survey/survey.py
View File

@ -125,8 +125,10 @@ class survey_survey(osv.Model):
def _get_public_url(self, cr, uid, ids, name, arg, context=None):
""" Computes a public URL for the survey """
base_url = self.pool.get('ir.config_parameter').get_param(cr, uid,
'web.base.url')
if context and context.get('relative_url'):
base_url = '/'
else:
base_url = self.pool['ir.config_parameter'].get_param(cr, uid, 'web.base.url')
res = {}
for survey in self.browse(cr, uid, ids, context=context):
res[survey.id] = urljoin(base_url, "survey/start/%s" % slug(survey))
@ -141,7 +143,10 @@ class survey_survey(osv.Model):
def _get_print_url(self, cr, uid, ids, name, arg, context=None):
""" Computes a printing URL for the survey """
base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
if context and context.get('relative_url'):
base_url = '/'
else:
base_url = self.pool['ir.config_parameter'].get_param(cr, uid, 'web.base.url')
res = {}
for survey in self.browse(cr, uid, ids, context=context):
res[survey.id] = urljoin(base_url, "survey/print/%s" % slug(survey))
@ -149,8 +154,10 @@ class survey_survey(osv.Model):
def _get_result_url(self, cr, uid, ids, name, arg, context=None):
""" Computes an URL for the survey results """
base_url = self.pool.get('ir.config_parameter').get_param(cr, uid,
'web.base.url')
if context and context.get('relative_url'):
base_url = '/'
else:
base_url = self.pool['ir.config_parameter'].get_param(cr, uid, 'web.base.url')
res = {}
for survey in self.browse(cr, uid, ids, context=context):
res[survey.id] = urljoin(base_url, "survey/results/%s" % slug(survey))
@ -416,7 +423,8 @@ class survey_survey(osv.Model):
def action_start_survey(self, cr, uid, ids, context=None):
''' Open the website page with the survey form '''
trail = ""
if context and 'survey_token' in context:
context = dict(context or {}, relative_url=True)
if 'survey_token' in context:
trail = "/" + context['survey_token']
return {
'type': 'ir.actions.act_url',
@ -464,7 +472,8 @@ class survey_survey(osv.Model):
def action_print_survey(self, cr, uid, ids, context=None):
''' Open the website page with the survey printable view '''
trail = ""
if context and 'survey_token' in context:
context = dict(context or {}, relative_url=True)
if 'survey_token' in context:
trail = "/" + context['survey_token']
return {
'type': 'ir.actions.act_url',
@ -475,6 +484,7 @@ class survey_survey(osv.Model):
def action_result_survey(self, cr, uid, ids, context=None):
''' Open the website page with the survey results view '''
context = dict(context or {}, relative_url=True)
return {
'type': 'ir.actions.act_url',
'name': "Results of the Survey",
@ -484,6 +494,7 @@ class survey_survey(osv.Model):
def action_test_survey(self, cr, uid, ids, context=None):
''' Open the website page with the survey form into test mode'''
context = dict(context or {}, relative_url=True)
return {
'type': 'ir.actions.act_url',
'name': "Results of the Survey",