From 8afec5ab6c2b1c60104cfaa204059bc303362a8b Mon Sep 17 00:00:00 2001 From: Martin Janser Date: Tue, 9 Sep 2025 17:31:13 +0200 Subject: [PATCH 1/2] Sort object bricks by name --- src/Controller/Admin/DataObject/ClassController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Controller/Admin/DataObject/ClassController.php b/src/Controller/Admin/DataObject/ClassController.php index b0c07b486..54e8657a0 100644 --- a/src/Controller/Admin/DataObject/ClassController.php +++ b/src/Controller/Admin/DataObject/ClassController.php @@ -1256,7 +1256,13 @@ public function objectbrickTreeAction(Request $request, EventDispatcherInterface } } + usort($groups, function ($a, $b) { + return strcmp($a['text'], $b['text']); + }); foreach ($groups as $group) { + usort($group['children'], function ($a, $b) { + return strcmp($a['title'], $b['title']); + }); $definitions[] = $group; } From fbcd41a597250190d2ada5785cc20a5c7f353eba Mon Sep 17 00:00:00 2001 From: Martin Janser Date: Wed, 10 Sep 2025 07:51:20 +0200 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Jacob Dreesen --- src/Controller/Admin/DataObject/ClassController.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Controller/Admin/DataObject/ClassController.php b/src/Controller/Admin/DataObject/ClassController.php index 54e8657a0..ffa8fcf76 100644 --- a/src/Controller/Admin/DataObject/ClassController.php +++ b/src/Controller/Admin/DataObject/ClassController.php @@ -1256,13 +1256,9 @@ public function objectbrickTreeAction(Request $request, EventDispatcherInterface } } - usort($groups, function ($a, $b) { - return strcmp($a['text'], $b['text']); - }); + usort($groups, static fn ($a, $b) => $a['text'] <=> $b['text']); foreach ($groups as $group) { - usort($group['children'], function ($a, $b) { - return strcmp($a['title'], $b['title']); - }); + usort($group['children'], static fn ($a, $b) => $a['title'] <=> $b['title']); $definitions[] = $group; }