Resolve DataCollection imports from ILIAS 8.12 and lower

iszmais · Jul 4, 2024 · 544c855 · 544c855
1 parent 6d361a2
commit 544c855
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/Modules/DataCollection/classes/class.ilDataCollectionDataSet.php b/Modules/DataCollection/classes/class.ilDataCollectionDataSet.php
@@ -85,7 +85,7 @@ public function __construct()
 
     public function getSupportedVersions(): array
     {
-        return ['4.5.0'];
+        return ['4.5.0', '8.13'];
     }
 
     /**
@@ -444,6 +444,11 @@ public function importRecord(
                                     $value = null;
                                 }
                                 break;
+                            case ilDclDatatype::INPUTFORMAT_TEXT:
+                                if (version_compare($a_schema_version, "8.13") < 0) {
+                                    $a_rec['value'] = str_replace('&lt;br /&gt;', '', $a_rec['value']);
+                                }
+                                // no break
                             default:
                                 $value = $a_rec['value'];
                                 if ($a_entity == 'il_dcl_stloc3_value' && empty($value)) {

diff --git a/Modules/DataCollection/classes/class.ilDataCollectionExporter.php b/Modules/DataCollection/classes/class.ilDataCollectionExporter.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -13,8 +14,7 @@
  * https://www.ilias.de
  * https://github.com/ILIAS-eLearning
  *
- ********************************************************************
- */
+ *********************************************************************/
 
 /**
  * Class ilDataCollectionExporter
@@ -45,8 +45,13 @@ public function getValidSchemaVersions(string $a_entity): array
             '4.5.0' => array(
                 'namespace' => 'https://www.ilias.de/Modules/DataCollection/dcl/4_5',
                 'xsd_file" => "ilias_dcl_4_5.xsd',
-                'uses_dataset' => true,
                 'min' => '4.5.0',
+                'max' => '8.12',
+            ),
+            '8.13' => array(
+                'namespace' => 'https://www.ilias.de/Modules/DataCollection/dcl/4_5',
+                'xsd_file" => "ilias_dcl_4_5.xsd',
+                'min' => '8.13',
                 'max' => '',
             ),
         );

diff --git a/src/UI/templates/default/MainControls/footer.less b/src/UI/templates/default/MainControls/footer.less
@@ -24,10 +24,7 @@ footer{
 			display: inline-block;
 			margin-right: @il-margin-xs-horizontal;
 			a, button {
-				color: @il-footer-link-color;
-			}
-			a:hover, button:hover {
-				color: @il-footer-link-hover-color;
+				color: @il-link-color;
 			}
 			button {
 				vertical-align: baseline;

diff --git a/templates/default/delos.css b/templates/default/delos.css
@@ -10733,10 +10733,6 @@ footer {
 .il-maincontrols-footer .il-footer-links li button {
   color: #4c6586;
 }
-.il-maincontrols-footer .il-footer-links li a:hover,
-.il-maincontrols-footer .il-footer-links li button:hover {
-  color: #3a4c65;
-}
 .il-maincontrols-footer .il-footer-links li button {
   vertical-align: baseline;
 }

diff --git a/templates/default/less/variables.less b/templates/default/less/variables.less
@@ -311,9 +311,6 @@ with the il- variable set here.
 @il-footer-height: 45px;
 //** controls margin from the footer to the main content, increase/decrase depending on the content (default, space for 4 lines).
 @il-footer-margin-bottom: 2*@il-line-height-computed*2;
-//** controls link colours inside the footer, see https://mantis.ilias.de/view.php?id=41560
-@il-footer-link-color: @il-link-color;
-@il-footer-link-hover-color: @il-link-hover-color;
 
 //== Buttons
 //