mod_collabora: fix wrong sort param in get_area_files

learnweb · Nov 4, 2024 · c94a7d3 · c94a7d3
1 parent 2bad63e
commit c94a7d3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,9 @@ moodle-mod_collabora
 Changes
 -------
 
+### v4.5.1
+* 2024-11-04 -  Fix wrong sort param int get_area_files while loading the current group file.
+
 ### v4.5.0
 * 2024-10-30 -  Add support for managing templates.
 

diff --git a/backup/moodle2/restore_collabora_stepslib.php b/backup/moodle2/restore_collabora_stepslib.php
@@ -127,7 +127,8 @@ protected function fix_file_timestamps($cm) {
             'mod_collabora',
             collabora_fs::FILEAREA_GROUP,
             false,
-            'filename',
+            // The sorting is important because of the way we store document versions.
+            'filepath',
             false
         );
         // Set the timemodified field to the value from the filepath which represents the version.

diff --git a/classes/api/base_filesystem.php b/classes/api/base_filesystem.php
@@ -507,7 +507,8 @@ public function get_version_files() {
             $this->file->get_component(), // Param component.
             $this->file->get_filearea(),  // Param filearea.
             $this->file->get_itemid(),    // Param itemid.
-            'filename',                   // Param sort.
+            // The sorting is important because of the way we store document versions.
+            'filepath',                   // Param sort.
             false                         // Param includedirs.
         );
         $result = [];

diff --git a/classes/api/collabora_fs.php b/classes/api/collabora_fs.php
@@ -307,7 +307,8 @@ private function create_retrieve_file() {
             'mod_collabora',      // Param component.
             self::FILEAREA_GROUP, // Param filearea.
             $this->groupid,       // Param itemid.
-            'filename',           // Param sort.
+            // The sorting is important because of the way we store document versions.
+            'filepath',           // Param sort.
             false,                // Param includedirs.
             0,                    // Param updatedsince.
             0,                    // Param limitfrom.

diff --git a/mod_form.php b/mod_form.php
@@ -39,7 +39,7 @@ private function get_initial_file_link() {
         $fs    = get_file_storage();
         $files = $fs->get_area_files(
             $this->context->id,             // Param contextid.
-            'mod_collabora',                // Param component
+            'mod_collabora',                // Param component.
             collabora_fs::FILEAREA_INITIAL, // Param filearea.
             false,                          // Param itemid.
             '',                             // Param sort.

diff --git a/version.php b/version.php
@@ -23,8 +23,8 @@
  */
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version   = 2024103000;
-$plugin->release   = 'v4.5.0 (2024103000)';
+$plugin->version   = 2024103001;
+$plugin->release   = 'v4.5.1 (2024110400)';
 $plugin->requires  = 2022111800; // Moodle 4.1.
 $plugin->component = 'mod_collabora';
 $plugin->maturity  = MATURITY_BETA;