FIX Include default_sort in sortChildren method

silverstripe · Jul 25, 2022 · b176a49 · b176a49
1 parent 3605a40
commit b176a49
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/code/GraphQL/Resolvers/FolderTypeResolver.php b/code/GraphQL/Resolvers/FolderTypeResolver.php
@@ -142,6 +142,12 @@ public static function sortChildren(array $context): Closure
             $classNameField = "(CASE WHEN \"ClassName\"={$className} THEN 1 ELSE 0 END)";
             $sortArgs = array_merge([$classNameField => 'DESC'], $sortArgs);
 
+            // Handle File::$default_sort when it has default value of "\"Name\""
+            $defaultSort = File::config()->get('default_sort');
+            if ($defaultSort === "\"Name\"") {
+                $sortArgs = array_merge($sortArgs, ['Name' => 'ASC']);
+            }
+
             $sort = [];
             foreach ($sortArgs as $field => $dir) {
                 if ($field == $classNameField) {