Test: Fix Navigation on Empty FileQuestion

See: https://mantis.ilias.de/view.php?id=42560
ILIAS-eLearning · Dec 8, 2024 · 82e5bd8 · 82e5bd8
1 parent c632f0a
commit 82e5bd8
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/Modules/TestQuestionPool/classes/class.assFileUpload.php b/Modules/TestQuestionPool/classes/class.assFileUpload.php
@@ -48,6 +48,8 @@ class assFileUpload extends assQuestion implements ilObjQuestionScoringAdjustabl
 
     protected string $allowedextensions = '';
 
+    private ?string $current_cmd;
+
     /** @var boolean Indicates whether completion by submission is enabled or not */
     protected $completion_by_submission = false;
 
@@ -72,10 +74,12 @@ public function __construct(
         $question = ''
     ) {
         parent::__construct($title, $comment, $author, $owner, $question);
+        /** @var ILIAS\DI\Container $DIC */
         global $DIC;
         $this->irss = $DIC->resourceStorage();
         $this->file_delivery = $DIC->fileDelivery();
         $this->file_upload = $DIC->upload();
+        $this->current_cmd = $DIC['ilCtrl']->getCmd();
     }
 
     /**
@@ -511,7 +515,7 @@ public function getUploadedFilesForWeb($active_id, $pass): array
 
                 if ($data['value2'] === 'rid') {
                     $rid = $this->irss->manage()->find($data['value1']);
-                    if($rid === null) {
+                    if ($rid === null) {
                         continue;
                     }
                     $revision = $this->irss->manage()->getCurrentRevision($rid);
@@ -679,7 +683,10 @@ public function saveWorkingData($active_id, $pass = null, $authorized = true): b
         $test_id = $this->testParticipantInfo->lookupTestIdByActiveId($active_id);
 
         try {
-            $upload_handling_required = $this->isFileUploadAvailable() && $this->checkUpload();
+            $upload_handling_required = $this->current_cmd !== 'submitSolution'
+                && !$this->isFileDeletionAction()
+                && $this->isFileUploadAvailable()
+                && $this->checkUpload();
         } catch (IllegalStateException $e) {
             $this->tpl->setOnScreenMessage('failure', $e->getMessage(), true);
             return false;