Merge pull request #4027 from nhaagen/7/TA/21097

TA: 21997, do not (auto)save over max passes.
ILIAS-eLearning · Feb 23, 2022 · f33952f · f33952f
2 parents 2a8bee5 + 693e973
commit f33952f
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/Modules/Test/classes/class.ilTestOutputGUI.php b/Modules/Test/classes/class.ilTestOutputGUI.php
@@ -619,6 +619,16 @@ public function saveQuestionSolution($authorized = true, $force = false)
                 return false;
             }
         }
+
+        /*
+            #21097 - exceed maximum passes
+            this is a battle of conditions; e.g. ilTestPlayerAbstractGUI::autosaveOnTimeLimitCmd forces saving of results.
+            However, if an admin has finished the pass in the meantime, a new pass should not be created.
+        */
+        if ($force && $this->isNrOfTriesReached()) {
+            $force = false;
+        }
+
         // save question solution
         if ($this->canSaveResult() || $force) {
             // but only if the ending time is not reached
@@ -655,7 +665,7 @@ public function saveQuestionSolution($authorized = true, $force = false)
             }
         }
 
-        if ($this->saveResult == false || (!$questionOBJ->validateSolutionSubmit() && $questionOBJ->savePartial()) ) {
+        if ($this->saveResult == false || (!$questionOBJ->validateSolutionSubmit() && $questionOBJ->savePartial())) {
             $this->ctrl->setParameter($this, "save_error", "1");
             $_SESSION["previouspost"] = $_POST;
         }
@@ -678,7 +688,7 @@ protected function showInstantResponseCmd()
             }
             $this->testSequence->setQuestionChecked($questionId);
             $this->testSequence->saveToDb();
-        } else if ($this->object->isForceInstantFeedbackEnabled()) {
+        } elseif ($this->object->isForceInstantFeedbackEnabled()) {
             $this->testSequence->setQuestionChecked($questionId);
             $this->testSequence->saveToDb();
         }