From d5e8b42690d54136f3420d9bb5e5f5384508f2ec Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Thu, 7 Aug 2014 16:56:40 +0200
Subject: [PATCH] [FIX] survey: use relative urls for url actions
---
addons/survey/survey.py | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 5100b72f884d..c4d7565c1f37 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -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",
--
GitLab