Fixed Show/Hide advanced settings in new question action.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@10739 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Aug 15, 2011 · b9fe31c · b9fe31c
1 parent 3647639
commit b9fe31c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/application/controllers/admin/question.php b/application/controllers/admin/question.php
@@ -1432,12 +1432,13 @@ function delete()
 
     }
 
-    function questionattributes()
+    function ajaxquestionattributes()
     {
-
+        $surveyid = $this->input->post("sid");
+        $qid = $this->input->post("qid");
         $thissurvey=getSurveyInfo($surveyid);
-        $type=returnglobal('question_type');
-        if (isset($qid))
+        $type=$this->input->post('question_type');
+        if ($qid != "undefined")
         {
             $attributesettings=getQuestionAttributes($qid);
         }
@@ -1502,6 +1503,7 @@ function questionattributes()
                 $ajaxoutput .="</li>\n";
             }
             $ajaxoutput .= "</ul></fieldset>";
+			echo $ajaxoutput;
         }
     }
 

diff --git a/scripts/admin/admin_core.js b/scripts/admin/admin_core.js
@@ -340,7 +340,7 @@ function updatequestionattributes()
         $('#advancedquestionsettings').html('');
         var selected_value = qDescToCode[''+$("#question_type_child .selected").text()];
         if (selected_value==undefined) selected_value = $("#question_type").val();
-        $('#advancedquestionsettings').load('admin.php?action=ajaxquestionattributes',{qid:$('#qid').val(),
+        $('#advancedquestionsettings').load('../../ajaxquestionattributes',{qid:$('#qid').val(),
                                                                                    question_type:selected_value,
                                                                                    sid:$('#sid').val()
                                                                                   }, function(){