dev: Fixed question selector not remembering the selected option + no…

…w respects user vs global setting for selector
LimeSurvey · Apr 17, 2013 · 3381eba · 3381eba
1 parent ed05ab5
commit 3381eba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/application/controllers/admin/questions.php b/application/controllers/admin/questions.php
@@ -796,10 +796,12 @@ public function index($sa, $surveyid, $gid, $qid=null)
 
             if ($activated != "Y")
             {
-                // Prepare selector Class for javascript function : TODO with or without picture
-                $selectormodeclass = 'full';
-                if (Yii::app()->session['questionselectormode'] == 'none')
-                    $selectormodeclass = 'none';
+                // Prepare selector Class for javascript function
+                if (Yii::app()->session['questionselectormode'] !== 'default') {
+                    $selectormodeclass = Yii::app()->session['questionselectormode'];
+                } else {
+                    $selectormodeclass = getGlobalSetting('defaultquestionselectormode', 'default');
+                }                
 
                 $aData['selectormodeclass'] = $selectormodeclass;
             }

diff --git a/application/views/admin/survey/Question/editQuestion_view.php b/application/views/admin/survey/Question/editQuestion_view.php
@@ -138,7 +138,9 @@
                                     'events' => array(
                                     ),
                                     'htmlOptions' => array(
-                                        'id' => 'question_type'
+                                        'id' => 'question_type',
+                                        'options' => array(
+                                        $eqrow['type']=>array('selected'=>true))
                                     )
                                 ));
                                 $script = '$("#question_type option").addClass("questionType");';