Dev: New corrections of question theme selection on edit question page

LimeSurvey · May 24, 2018 · c166461 · c166461
1 parent 0668e18
commit c166461
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/application/controllers/admin/questions.php b/application/controllers/admin/questions.php
@@ -1285,7 +1285,7 @@ public function index($sa, $surveyid, $gid, $qid = null)
             $aData['gid'] = $gid;
             $questionTemplateAttributes = Question::model()->getAdvancedSettingsWithValues($qid, $eqrow['type'], $surveyid);
             if (!empty($questionTemplateAttributes['question_template'])){
-                $aData['aQuestionTemplateAttributes'] = \QuestionTemplate::getQuestionTemplateList($eqrow['type']);
+                $aData['aQuestionTemplateAttributes'] = $questionTemplateAttributes['question_template'];
             } else {
                 $aData['aQuestionTemplateAttributes']['core'] = array('title'=>'Default', 'preview'=>\LimeSurvey\Helpers\questionHelper::getQuestionThemePreviewUrl($eqrow['type']));
             }

diff --git a/application/views/admin/survey/Question/editQuestion_view.php b/application/views/admin/survey/Question/editQuestion_view.php
@@ -12,6 +12,7 @@
 $aQuestionTypeGroups = array();
 $aQuestionTypeList = (array) getQuestionTypeList($eqrow['type'], 'array');
 $question_template_preview = \LimeSurvey\Helpers\questionHelper::getQuestionThemePreviewUrl($eqrow['type']);
+$selected = null;
 
 foreach ( $aQuestionTypeList as $key=> $questionType)
 {
@@ -237,10 +238,12 @@
                                     <label class=" control-label" for='gid' title="<?php eT("Use a customized question theme for this question");?>"><?php eT("Question theme:"); ?></label>
                                     <div class="">
                                         <select id="question_template" name="question_template" class="form-control">
-                                            <?php
+                                            <?php 
                                             foreach ($aQuestionTemplateList as $code => $value) { 
-                                                    $selected = $aQuestionTemplateAttributes[$code] == $code ? 'selected' : '';
-                                                    $question_template_preview = $aQuestionTemplateAttributes[$code] == $code ? $value['preview'] : $question_template_preview;
+                                                    if (!empty($aQuestionTemplateAttributes)){
+                                                        $question_template_preview = $aQuestionTemplateAttributes['value'] == $code ? $value['preview'] : $question_template_preview;
+                                                        $selected = $aQuestionTemplateAttributes['value'] == $code ? 'selected' : '';
+                                                    }
                                                     if(YII_DEBUG) {
                                                         echo sprintf("<option value='%s' %s>%s (code: %s)</option>", $code, $selected, $value['title'], $code);
                                                     } else {