From 7ca8a4aa04c2939d24d86f16cb9485fcca551d5b Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 17 Apr 2023 13:36:09 +0200 Subject: [PATCH] fix filemanager date ordering add order by type --- src/core/FileManager/FsFileManager.php | 14 ++++++++------ .../assets/js/components/file-manager/Files.vue | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/core/FileManager/FsFileManager.php b/src/core/FileManager/FsFileManager.php index 3b4b5a4..38e6e5c 100644 --- a/src/core/FileManager/FsFileManager.php +++ b/src/core/FileManager/FsFileManager.php @@ -301,14 +301,16 @@ class FsFileManager protected function applySort(Finder $finder, string $sort, string $direction) { - if ('name' === $sort) { - $finder->sortByName(); - } elseif ('updated_date' === $sort) { - $finder->sortByModifiedTime(); - } + $sorts = [ + 'name' => 'sortByName', + 'type' => 'sortByType', + 'updated_at' => 'sortByModifiedTime', + ]; if ('desc' === $direction) { - $finder->reverseSorting(); + $finder->{$sorts[$sort]}()->reverseSorting(); + } else { + $finder->{$sorts[$sort]}(); } } diff --git a/src/core/Resources/assets/js/components/file-manager/Files.vue b/src/core/Resources/assets/js/components/file-manager/Files.vue index 0503db4..515b5b0 100644 --- a/src/core/Resources/assets/js/components/file-manager/Files.vue +++ b/src/core/Resources/assets/js/components/file-manager/Files.vue @@ -26,6 +26,7 @@