[IMP] solved escape quote problem in JavaScript, removed extra result link
bzr revid: pga@tinyerp.com-20140129090807-m0gduih1pjilmcr6
This commit is contained in:
parent
f93465f4a4
commit
fe50ebe4ec
|
@ -104,17 +104,8 @@ class survey_survey(osv.Model):
|
||||||
""" Computes an URL for the survey results """
|
""" Computes an URL for the survey results """
|
||||||
base_url = self.pool.get('ir.config_parameter').get_param(cr, uid,
|
base_url = self.pool.get('ir.config_parameter').get_param(cr, uid,
|
||||||
'web.base.url')
|
'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 #
|
# Model fields #
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
|
|
|
@ -140,7 +140,7 @@
|
||||||
<div class="tab-pane active" t-att-id="'graph_question_'+str(question.id)">
|
<div class="tab-pane active" t-att-id="'graph_question_'+str(question.id)">
|
||||||
<!-- Dynamic script for single bar chart -->
|
<!-- Dynamic script for single bar chart -->
|
||||||
<script>
|
<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() {
|
nv.addGraph(function() {
|
||||||
var chart = nv.models.discreteBarChart()
|
var chart = nv.models.discreteBarChart()
|
||||||
.x(function(d) { return d.text })
|
.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)">
|
<div class="tab-pane active with-3d-shadow with-transitions" t-att-id="'graph_question_'+str(question.id)">
|
||||||
<!-- Dynamic script for Multi bar chart -->
|
<!-- Dynamic script for Multi bar chart -->
|
||||||
<script>
|
<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(){
|
nv.addGraph(function(){
|
||||||
var chart = nv.models.multiBarChart()
|
var chart = nv.models.multiBarChart()
|
||||||
.x(function(d) { return d.text })
|
.x(function(d) { return d.text })
|
||||||
|
|
|
@ -129,7 +129,6 @@
|
||||||
<field name="visible_to_user" />
|
<field name="visible_to_user" />
|
||||||
<field name="auth_required" />
|
<field name="auth_required" />
|
||||||
<field name="public_url" widget="url" attrs="{'invisible': [('visible_to_user', '=', False)]}"/>
|
<field name="public_url" widget="url" attrs="{'invisible': [('visible_to_user', '=', False)]}"/>
|
||||||
<field name="result_url" widget="url"/>
|
|
||||||
</group>
|
</group>
|
||||||
<field name="description" />
|
<field name="description" />
|
||||||
<notebook>
|
<notebook>
|
||||||
|
|
Loading…
Reference in New Issue