Fixed issue #13193: Unable to update question type (simple selector)

LimeSurvey · Jan 19, 2018 · 2bde785 · 2bde785
1 parent d3168a8
commit 2bde785
Show file tree

Hide file tree

Showing 5 changed files with 146 additions and 125 deletions.
diff --git a/application/controllers/admin/questions.php b/application/controllers/admin/questions.php
@@ -1035,7 +1035,6 @@ public function newquestion($surveyid)
         $eqrow['title'] = '';
         $eqrow['question'] = '';
         $eqrow['help'] = '';
-        $eqrow['type'] = 'T';
         $eqrow['lid'] = 0;
         $eqrow['lid1'] = 0;
         $eqrow['gid'] = null;
@@ -1046,6 +1045,8 @@ public function newquestion($surveyid)
         $eqrow['group_name'] = '';
         $eqrow['modulename'] = '';
         $eqrow['conditions_number'] = false;
+        $eqrow['type'] = 'T';
+
         if (isset($_GET['gid'])) {
             $eqrow['gid'] = $_GET['gid'];
         }
@@ -1070,6 +1071,7 @@ public function newquestion($surveyid)
 
         $aData['accordionDatas']['selectormodeclass'] = $selectormodeclass;
         $aData['selectormodeclass'] = $selectormodeclass;
+        $aData['ajaxDatas']['selectormodeclass'] = $selectormodeclass;
 
 
         $aData['accordionDatas']['eqrow'] = $eqrow;
@@ -1305,6 +1307,7 @@ public function index($sa, $surveyid, $gid, $qid = null)
                 }
 
                 $aData['selectormodeclass'] = $selectormodeclass;
+                $aData['ajaxDatas']['selectormodeclass'] = $selectormodeclass;
             }
 
             /**
@@ -1324,7 +1327,9 @@ public function index($sa, $surveyid, $gid, $qid = null)
             App()->getClientScript()->registerScriptFile(App()->getConfig('adminscripts').'questions.js', LSYii_ClientScript::POS_BEGIN);
 
             $aData['sValidateUrl'] = ($adding || $copying) ? $this->getController()->createUrl('admin/questions', array('sa' => 'ajaxValidate', 'surveyid'=>$surveyid)) : $this->getController()->createUrl('admin/questions', array('sa' => 'ajaxValidate', 'surveyid'=>$surveyid, 'qid'=>$qid));
-
+            $aData['ajaxDatas']['sValidateUrl'] = $aData['sValidateUrl'];
+            $aData['ajaxDatas']['qTypeOutput'] = $aData['qTypeOutput'];
+
             $aData['addlanguages'] = Survey::model()->findByPk($surveyid)->additionalLanguages;
 
             $aViewUrls['editQuestion_view'][] = $aData;
@@ -1333,7 +1338,7 @@ public function index($sa, $surveyid, $gid, $qid = null)
                     include('accessDenied.php');
         }
 
-        $aData['ajaxDatas']['sValidateUrl'] = (isset($aData['sValidateUrl'])) ? $aData['sValidateUrl'] : $this->getController()->createUrl('admin/questions', array('sa' => 'ajaxValidate', 'surveyid'=>$surveyid));
+
         $aData['ajaxDatas']['qTypeOutput'] = $aData['qTypeOutput'];
 
         ///////////

diff --git a/application/views/admin/super/layout_insurvey.php b/application/views/admin/super/layout_insurvey.php
@@ -32,7 +32,7 @@
 
         echo '<div id="pjax-content" '
         . 'class="ls-flex-column align-items-flex-start align-content-center col-11 ls-flex-item transition-animate-width" '
-        . 'style="max-width:80%;"'
+        . 'style="max-width:80%;" '
         . 'v-bind:style="{\'max-width\': $store.getters.substractContainer, \'min-height\': $store.state.inSurveyViewHeight+\'px\'}"'
         . '>';