Fixed issue #17984: Using RemoteControl method list_questions does no…

…t return subquestions (#2345)
LimeSurvey · Apr 27, 2022 · 1c677f7 · 1c677f7
1 parent 4ca5c39
commit 1c677f7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/application/helpers/remotecontrol/remotecontrol_handle.php b/application/helpers/remotecontrol/remotecontrol_handle.php
@@ -2307,10 +2307,10 @@ public function list_questions($sSessionKey, $iSurveyID, $iGroupID = null, $sLan
                     if ($oGroup->sid != $oSurvey->sid) {
                         return ['status' => 'Error: Mismatch in surveyid and groupid'];
                     } else {
-                        $aQuestionList = $oGroup->questions;
+                        $aQuestionList = $oGroup->allQuestions;
                     }
                 } else {
-                    $aQuestionList = $oSurvey->baseQuestions;
+                    $aQuestionList = $oSurvey->allQuestions;
                 }
 
                 if (count($aQuestionList) == 0) {

diff --git a/application/models/QuestionGroup.php b/application/models/QuestionGroup.php
@@ -475,4 +475,15 @@ public static function getTotalGroupsWithQuestions($surveyid)
 
         return $result;
     }
+
+    /**
+     * Returns all group questions (including subquestions)
+     * @return Question[]
+     */
+    public function getAllQuestions()
+    {
+        /** @var Question[] $questions */
+        $questions = Question::model()->findAllByAttributes(['gid' => $this->gid]);
+        return $questions;
+    }
 }