Merge branch 'master' into develop

Conflicts: application/controllers/admin/questions.php
LimeSurvey · May 17, 2018 · c51c8eb · c51c8eb
2 parents 249d5ce + c92ca48
commit c51c8eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/application/controllers/admin/questions.php b/application/controllers/admin/questions.php
@@ -1005,6 +1005,9 @@ public function newquestion($surveyid)
         }
         $aData['oQuestion'] = $oQuestion;
         $aData['groupid'] = $oQuestion->gid;
+        $qid = null;
+        $aData['aQuestionTemplateAttributes'] = Question::model()->getAdvancedSettingsWithValues($qid, $eqrow['type'], $surveyid)['question_template'];
+        $aData['aQuestionTemplateList'] = \QuestionTemplate::getQuestionTemplateList($eqrow['type']);
 
         $sumresult1 = $survey;
         if (is_null($sumresult1)) {

diff --git a/application/core/LSETwigViewRenderer.php b/application/core/LSETwigViewRenderer.php
@@ -154,6 +154,11 @@ public function renderQuestion($sView, $aData)
         if (file_exists($requiredView.'.twig')) {
             // We're not using the Yii Theming system, so we don't use parent::renderFile
             // current controller properties will be accessible as {{ this.property }}
+
+            //  aData and surveyInfo variables are accessible from question type twig files
+            $aData['aData'] = $aData;
+            $sBaseLanguage = Survey::model()->findByPk($_SESSION['LEMsid'])->language;
+            $aData['surveyInfo'] = getSurveyInfo($_SESSION['LEMsid'], $sBaseLanguage);
             $aData['this'] = Yii::app()->getController();
             $aData['question_template_attribute'] = $oQuestionTemplate->getCustomAttributes();
             $template = $this->_twig->loadTemplate($sView.'.twig')->render($aData);