summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormcm-odoo <mcm@odoo.com>2019-10-30 08:50:19 +0000
committerfw-bot <otis@odoo.com>2019-11-06 15:50:57 +0000
commite6eaa062c8f541bde63d6de8e576ccb852ea579e (patch)
tree55e0bb5f317cde940cf66de71cdf064b0172f67b
parent48a9db604f0a5c70330802c2ce42d0f7bdf587ce (diff)
[FIX] survey: prevent skipping filter features
This commit: https://github.com/odoo/odoo/commit/0eba50dd1c33a08f8862a5718149e61b822e1b5a introduced a 'return' in the survey.js script: return load_chart(chartConfig, '#scoring_results_chart'); This makes the rest of the script completely skipped and bypasses all the filter features. task-2116078 closes odoo/odoo#39898 X-original-commit: b7baaf4846ba9208aeba8ba4db7de4f142e147cc Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
-rw-r--r--addons/survey/static/src/js/survey_result.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/survey/static/src/js/survey_result.js b/addons/survey/static/src/js/survey_result.js
index 380a5c893a8..4d5148faf89 100644
--- a/addons/survey/static/src/js/survey_result.js
+++ b/addons/survey/static/src/js/survey_result.js
@@ -207,15 +207,15 @@ if(!$('.js_surveyresult').length) {
var chartConfig;
if(graph_type == 'multi_bar'){
chartConfig = init_multibar_chart(graph_data);
- return load_chart(chartConfig, containerSelector);
+ load_chart(chartConfig, containerSelector);
}
else if(graph_type == 'bar'){
chartConfig = init_bar_chart(graph_data);
- return load_chart(chartConfig, containerSelector);
+ load_chart(chartConfig, containerSelector);
}
else if(graph_type == 'pie'){
chartConfig = init_pie_chart(graph_data);
- return load_chart(chartConfig, containerSelector);
+ load_chart(chartConfig, containerSelector);
}
else if (graph_type === 'doughnut') {
var quizz_score = $(graph).attr("quizz-score") || 0.0;
@@ -227,7 +227,7 @@ if(!$('.js_surveyresult').length) {
var $scoringResultsChart = $('#scoring_results_chart');
if ($scoringResultsChart.length > 0) {
var chartConfig = init_pie_chart($scoringResultsChart.data('graph_data'));
- return load_chart(chartConfig, '#scoring_results_chart');
+ load_chart(chartConfig, '#scoring_results_chart');
}
// Script for filter