From fe50ebe4ec634fec139867802d6e2678b921e001 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Wed, 29 Jan 2014 14:38:07 +0530
Subject: [PATCH] [IMP] solved escape quote problem in JavaScript, removed
 extra result link

bzr revid: pga@tinyerp.com-20140129090807-m0gduih1pjilmcr6
---
 addons/survey/survey.py               | 11 +----------
 addons/survey/views/survey_result.xml |  4 ++--
 addons/survey/views/survey_views.xml  |  1 -
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 8c5a00cf3d7..e964c679afc 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -104,17 +104,8 @@ class survey_survey(osv.Model):
         """ Computes an URL for the survey results """
         base_url = self.pool.get('ir.config_parameter').get_param(cr, uid,
             'web.base.url')
-        return {id: urljoin(base_url, "survey/result/%s/" % id) for id in ids}
+        return {id: urljoin(base_url, "survey/results/%s/" % id) for id in ids}
 
-    def _get_result_url(self, cr, uid, ids, name, arg, context=None):
-        """ Computes a result URL for the survey """
-        res = dict((id, 0) for id in ids)
-        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid,
-            'web.base.url')
-        for survey_browse in self.browse(cr, uid, ids, context=context):
-            res[survey_browse.id] = urljoin(base_url, "survey/results/%s/"
-                                            % survey_browse.id)
-        return res
     # Model fields #
 
     _columns = {
diff --git a/addons/survey/views/survey_result.xml b/addons/survey/views/survey_result.xml
index 24fc3cab4f0..818e473c805 100644
--- a/addons/survey/views/survey_result.xml
+++ b/addons/survey/views/survey_result.xml
@@ -140,7 +140,7 @@
                 <div class="tab-pane active" t-att-id="'graph_question_'+str(question.id)">
                     <!-- Dynamic script for single bar chart -->
                     <script>
-                        var question_<t t-esc="question.id"></t> = <t t-esc="get_graph_data(question)"></t>;
+                        var question_<t t-esc="question.id"></t> = <t t-raw="get_graph_data(question)"></t>;
                         nv.addGraph(function() {
                             var chart = nv.models.discreteBarChart()
                                 .x(function(d) { return d.text })
@@ -225,7 +225,7 @@
             <div class="tab-pane active with-3d-shadow with-transitions" t-att-id="'graph_question_'+str(question.id)">
                 <!-- Dynamic script for Multi bar chart -->
                 <script>
-                    var question_<t t-esc="question.id"></t> = <t t-esc="get_graph_data(question)"></t>;
+                    var question_<t t-esc="question.id"></t> = <t t-raw="get_graph_data(question)"></t>;
                     nv.addGraph(function(){
                         var chart = nv.models.multiBarChart()
                             .x(function(d) { return d.text })
diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml
index fe46dd78ca9..153f50d0f8b 100644
--- a/addons/survey/views/survey_views.xml
+++ b/addons/survey/views/survey_views.xml
@@ -129,7 +129,6 @@
                             <field name="visible_to_user" />
                             <field name="auth_required" />
                             <field name="public_url" widget="url" attrs="{'invisible': [('visible_to_user', '=', False)]}"/>
-                            <field name="result_url" widget="url"/>
                         </group>
                         <field name="description" />
                         <notebook>