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

[IMP] solved escape quote problem in JavaScript, removed extra result link 

bzr revid: pga@tinyerp.com-20140129090807-m0gduih1pjilmcr6
This commit is contained in:
Parth Gajjar (Open ERP) 2014-01-29 14:38:07 +05:30
parent f93465f4a4
commit fe50ebe4ec
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/survey/survey.py
View File

@ -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 = {

4
addons/survey/views/survey_result.xml
View File

@ -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 })

1
addons/survey/views/survey_views.xml
View File

@ -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>