Fixed issue #18976 - default answers should persist with subquestions (…

…#3357)
LimeSurvey · Aug 15, 2023 · 4420f62 · Shnoulle · Aug 21, 2023 · Shnoulle
1 parent f022f3b
commit 4420f62
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/application/controllers/QuestionAdministrationController.php b/application/controllers/QuestionAdministrationController.php
@@ -533,8 +533,6 @@ public function actionSaveQuestionData()
             }
 
             if ($question->survey->active == 'N') {
-                // Clean subquestions before save.
-                $question->deleteAllSubquestions();
                 // If question type has subquestions, save them.
                 if ($question->questionType->subquestions > 0) {
                     $this->storeSubquestions(
@@ -2857,9 +2855,21 @@ private function storeSubquestions($question, $subquestionsArray)
     {
         $questionOrder = 0;
         $errorQuestions = [];
-        foreach ($subquestionsArray as $subquestionId => $subquestionArray) {
+        $subquestionIds = [];
+        foreach ($subquestionsArray as $subquestionArray) {
             foreach ($subquestionArray as $scaleId => $data) {
-                $subquestion = new Question();
+                $subquestion = null;
+                if (isset($data['oldcode'])) {
+                    $subquestion = Question::model()->findByAttributes([
+                        'sid' => $question->sid,
+                        'parent_qid' => $question->qid,
+                        'title' => $data['oldcode']
+                    ]);
+                }
+                if (!$subquestion) {
+                    $subquestion = new Question();
+                }
+
                 $subquestion->sid        = $question->sid;
                 $subquestion->gid        = $question->gid;
                 $subquestion->parent_qid = $question->qid;
@@ -2881,8 +2891,13 @@ private function storeSubquestions($question, $subquestionsArray)
                     continue;
                 }
                 $subquestion->refresh();
+                $subquestionIds[] = $subquestion->qid;
                 foreach ($data['subquestionl10n'] as $lang => $questionText) {
-                    $l10n = new QuestionL10n();
+                    $l10n = QuestionL10n::model()->findByAttributes([
+                        'qid' => $subquestion->qid,
+                        'language' => $lang
+                    ]);
+                    $l10n = $l10n ?? new QuestionL10n();
                     $l10n->qid = $subquestion->qid;
                     $l10n->language = $lang;
                     $l10n->question = $questionText;
@@ -2893,6 +2908,7 @@ private function storeSubquestions($question, $subquestionsArray)
                 }
             }
         }
+        $question->deleteAllSubquestions($subquestionIds);
         foreach ($errorQuestions as $errorQuestion) {
             throw (new LSUserException(500, gT("Could not save subquestion")))
                 ->setDetailedErrorsFromModel($errorQuestion);

diff --git a/application/models/Question.php b/application/models/Question.php
@@ -485,12 +485,15 @@ public function removeFromLastVisited()
     /**
      * Delete all subquestions that belong to this question.
      *
+     * @param ?array $exceptIds Don't delete subquestions with these ids.
      * @return void
      * @todo Duplication from delete()
      */
-    public function deleteAllSubquestions()
+    public function deleteAllSubquestions($exceptIds = [])
     {
-        $ids = $this->allSubQuestionIds;
+        $ids = !empty($exceptIds)
+            ? array_diff($this->allSubQuestionIds, $exceptIds)
+            : $this->allSubQuestionIds;
         $qidsCriteria = (new CDbCriteria())->addInCondition('qid', $ids);
         $res = Question::model()->deleteAll((new CDbCriteria())->addInCondition('qid', $ids));
         QuestionAttribute::model()->deleteAll($qidsCriteria);