Merge branch 'merge/9/9-5-20241105' into 'release_9'

Merge 9.5 See merge request ilias-hosting/ilias!15
thojou · Nov 5, 2024 · 8b084e8 · 8b084e8
2 parents 408d487 + 8198764
commit 8b084e8
Show file tree

Hide file tree

Showing 161 changed files with 3,862 additions and 3,685 deletions.
diff --git a/Modules/Chatroom/chat/package-lock.json b/Modules/Chatroom/chat/package-lock.json
diff --git a/Modules/Chatroom/chat/package.json b/Modules/Chatroom/chat/package.json
@@ -4,12 +4,12 @@
   "version": "2.0.0",
   "dependencies": {
     "async": "^3.2",
-    "express": "^4.21.0",
+    "express": "^4.21.1",
     "mysql": "^2.18.1",
     "node-mysql": "^0.4.2",
     "node-schedule": "^2.1.0",
     "node-uuid": "^1.4.8",
-    "socket.io": "^4.7.5",
+    "socket.io": "^4.8.0",
     "socket.io-client": "^4.7.5",
     "winston": "^2.4.1"
   }

diff --git a/Modules/DataCollection/classes/Content/class.ilDclRecordEditGUI.php b/Modules/DataCollection/classes/Content/class.ilDclRecordEditGUI.php
@@ -447,9 +447,7 @@ public function saveConfirmation(ilDclBaseRecordModel $record_obj, string $fileh
             /** @var ilDclBaseRecordFieldModel $record_field */
             $record_field->addHiddenItemsToConfirmation($confirmation);
 
-            if (($record_field instanceof ilDclFileuploadRecordFieldModel || $record_field instanceof ilDclMobRecordFieldModel)
-                && $record_field->getValue() == null
-            ) {
+            if ($record_field instanceof ilDclFileRecordFieldModel && $record_field->getValue() == null) {
                 $empty_fileuploads['field_' . $field->getId()] = [
                     "name" => "",
                     "type" => "",
@@ -460,7 +458,7 @@ public function saveConfirmation(ilDclBaseRecordModel $record_obj, string $fileh
             }
             $record_representation = ilDclFieldFactory::getRecordRepresentationInstance($record_field);
 
-            if ($record_representation->getConfirmationHTML() != false) {
+            if ($record_representation->getConfirmationHTML() !== '') {
                 $record_data .= $field->getTitle() . ": " . $record_representation->getConfirmationHTML() . "<br />";
             }
         }

diff --git a/Modules/DataCollection/classes/Fields/File/class.ilDclFileFieldModel.php b/Modules/DataCollection/classes/Fields/File/class.ilDclFileFieldModel.php
@@ -23,24 +23,6 @@
  */
 class ilDclFileFieldModel extends ilDclBaseFieldModel
 {
-    public function getRecordQuerySortObject(
-        string $direction = "asc",
-        bool $sort_by_status = false
-    ): ?ilDclRecordQueryObject {
-        $join_str = "LEFT JOIN il_dcl_record_field AS sort_record_field_{$this->getId()} ON (sort_record_field_{$this->getId()}.record_id = record.id AND sort_record_field_{$this->getId()}.field_id = "
-            . $this->db->quote($this->getId(), 'integer') . ") ";
-        $join_str .= "LEFT JOIN il_dcl_stloc{$this->getStorageLocation()}_value AS sort_stloc_{$this->getId()} ON (sort_stloc_{$this->getId()}.record_field_id = sort_record_field_{$this->getId()}.id) ";
-        $join_str .= "LEFT JOIN il_resource_revision AS sort_object_data_{$this->getId()} ON (sort_object_data_{$this->getId()}.rid = sort_stloc_{$this->getId()}.value) ";
-        $select_str = " sort_object_data_{$this->getId()}.title AS field_{$this->getId()},";
-
-        $record_query = new ilDclRecordQueryObject();
-        $record_query->setSelectStatement($select_str);
-        $record_query->setJoinStatement($join_str);
-        $record_query->setOrderStatement("field_{$this->getId()} " . $direction . ", ID ASC");
-
-        return $record_query;
-    }
-
     public function allowFilterInListView(): bool
     {
         return false;

diff --git a/Modules/DataCollection/classes/Fields/File/class.ilDclFileFieldRepresentation.php b/Modules/DataCollection/classes/Fields/File/class.ilDclFileFieldRepresentation.php
@@ -18,15 +18,12 @@
 
 declare(strict_types=1);
 
-/**
- * @noinspection AutoloadingIssuesInspection
- */
 class ilDclFileFieldRepresentation extends ilDclBaseFieldRepresentation
 {
     public function getInputField(
         ilPropertyFormGUI $form,
         ?int $record_id = null
-    ): ?ilFormPropertyGUI {
+    ): ilFileInputGUI {
         $input = new ilFileInputGUI(
             $this->getField()->getTitle(),
             'field_' . $this->getField()->getId()

diff --git a/Modules/DataCollection/classes/Fields/File/class.ilDclFileRecordFieldModel.php b/Modules/DataCollection/classes/Fields/File/class.ilDclFileRecordFieldModel.php
@@ -44,11 +44,6 @@ public function __construct(ilDclBaseRecordModel $record, ilDclBaseFieldModel $f
         $this->upload = $DIC->upload();
     }
 
-    public function getRecordRepresentation(): ?ilDclBaseRecordRepresentation
-    {
-        return new ilDclFileRecordRepresentation($this);
-    }
-
     public function parseValue($value)
     {
         if ($value === -1) { // marked for deletion.