MW-1040: Refactored getQuestionAttributes usage at ResponsesController (

#3769) Co-authored-by: Lajos Arpad <arpad@endpoint.com>
LimeSurvey · Feb 29, 2024 · 26110d0 · 26110d0
1 parent 695a273
commit 26110d0
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/application/controllers/ResponsesController.php b/application/controllers/ResponsesController.php
@@ -167,6 +167,8 @@ public function actionView(int $surveyId, int $id, string $browseLang = ''): voi
             $fnames[] = ["submitdate", gT("Submission date"), gT("Completed"), "0", 'D', 'code' => 'submitdate'];
         }
         $fnames[] = ["completed", gT("Completed"), "0"];
+        $qids = [];
+        $fields = [];
 
         foreach ($fieldmap as $field) {
             if ($field['fieldname'] == 'lastpage' || $field['fieldname'] == 'submitdate') {
@@ -192,7 +194,21 @@ public function actionView(int $surveyId, int $id, string $browseLang = ''): voi
                     'code' => viewHelper::getFieldCode($field, ['LEMcompat' => true])
                 ];
             } elseif ($field['aid'] !== 'filecount') {
-                $qidattributes = QuestionAttribute::model()->getQuestionAttributes($field['qid']);
+                $qids[] = $field['qid'];
+                $fields[] = $field;
+            } else {
+                $fnames[] = [$field['fieldname'], gT("File count")];
+            }
+        }
+
+        if (count($qids)) {
+            $rawQuestions = Question::model()->findAllByPk($qids);
+            $questions = [];
+            foreach ($rawQuestions as $rawQuestion) {
+                $questions[$rawQuestion->qid] = $rawQuestion;
+            }
+            foreach ($fields as $field) {
+                $qidattributes = QuestionAttribute::model()->getQuestionAttributes($questions[$field['qid']]);
 
                 for ($i = 0; $i < $qidattributes['max_num_of_files']; $i++) {
                     $filenum = sprintf(gT("File %s"), $i + 1);
@@ -236,8 +252,6 @@ public function actionView(int $surveyId, int $id, string $browseLang = ''): voi
                         "index"    => $i
                     ];
                 }
-            } else {
-                $fnames[] = [$field['fieldname'], gT("File count")];
             }
         }