Fixed issue: live update of options on edit question page

LimeSurvey · Jun 22, 2018 · 68616fe · 68616fe
1 parent 9657178
commit 68616fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/application/views/admin/survey/Question/editQuestion_view.php b/application/views/admin/survey/Question/editQuestion_view.php
@@ -59,7 +59,7 @@
             'selectedClass' => Question::getQuestionClass($eqrow['type']),
             'onUpdate' => [
                 'value',
-                "console.ls.log(value); $('#question_type').val(value);"
+                "console.ls.log(value); $('#question_type').val(value); updatequestionattributes(''); updateQuestionTemplateOptions();"
             ]
         ]
     ));

diff --git a/assets/scripts/admin/questions.js b/assets/scripts/admin/questions.js
@@ -102,14 +102,12 @@ var QuestionFunctions = function () {
             });
 
             $('#question_type').on('change', function(){
-                updatequestionattributes('');  
-                updateQuestionTemplatePreview();
                 OtherSelection(this.value);
             });
 
             $(document).on('change', '#question_template', function(){
                 updatequestionattributes($('#question_template').val());  
-                updateQuestionTemplatePreview();
+                updateQuestionTemplateOptions('question_template');
             });
 
             /**
@@ -206,22 +204,7 @@ function updatequestionattributes(question_template_name) {
     });
 }
 
-function updateQuestionTemplateOptions() {
-    var type = $('#question_type').val();
-    $.ajax({
-        url: get_question_template_options_url,
-        data: {'type': type},
-        method: 'POST',
-        success: function (data) {
-            $("#question_template").html(""); 
-            $.each(data, function (key, value) {
-                $("#question_template").append("<option value="+key+">"+value.title+"</option>");
-            });
-        }
-    });
-}
-
-function updateQuestionTemplatePreview() {
+function updateQuestionTemplateOptions(selector = '') { // selector is only set when this function is called from #question_template
     var type = $('#question_type').val();
     var template = $('#question_template').val();
     $.ajax({
@@ -234,6 +217,13 @@ function updateQuestionTemplatePreview() {
             } else {
                 $("#QuestionTemplatePreview img").attr('src', data['core']['preview']);
             }
+
+            if (selector === ''){ // selector is not called from #question_template
+                $("#question_template").html(""); 
+                $.each(data, function (key, value) {
+                    $("#question_template").append("<option value="+key+">"+value.title+"</option>");
+                });
+            }
         }
     });
 }