Dev: Make sure question editor doesn't break at question theme error

LimeSurvey · Jun 3, 2021 · e2a45f5 · e2a45f5
1 parent 7a2c14d
commit e2a45f5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/application/models/QuestionTheme.php b/application/models/QuestionTheme.php
@@ -594,6 +594,18 @@ public static function findQuestionMetaData($question_type, $question_template =
         // todo: object or array?
         $baseQuestion = self::model()->query($criteria, false);
 
+        if (empty($baseQuestion)) {
+            $settings = new StdClass();
+            $settings->class = '';
+            $settings->answerscales = 0;
+            return [
+                'title' => gT('Question theme error: Missing metadata'),
+                'name' => gT('Question theme error: Missing metadata'),
+                'question_type' => '',
+                'settings' => $settings
+            ];
+        }
+
         // language settings
         $baseQuestion->title = gT($baseQuestion->title, "html", $language);
         $baseQuestion->group = gT($baseQuestion->group, "html", $language);

diff --git a/application/views/questionAdministration/create.php b/application/views/questionAdministration/create.php
@@ -64,6 +64,7 @@ class="btn navbar-btn button white btn-success"
                     <!-- Question code and question type selector -->
                     <div class="row">
                         <?php
+                        // TODO: Change this to $question->question_theme->config->metadata
                         $questionTheme = QuestionTheme::findQuestionMetaData($oQuestion->type, $questionTemplate);
                         $this->renderPartial(
                             "codeAndType",