Merge pull request #3526 from ingef/feature/sort-admin-ui-dropdowns

sort dropdown options in admin-ui
ingef · Aug 14, 2024 · 71e2cee · 71e2cee
2 parents 21d5916 + 2a67e1d
commit 71e2cee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...rc/main/resources/com/bakdata/conquery/resources/admin/ui/templates/groupHandler.html.ftl b/...rc/main/resources/com/bakdata/conquery/resources/admin/ui/templates/groupHandler.html.ftl
@@ -6,7 +6,7 @@
 		<div class="form-group">
 			<label for="group_id">Group:</label>
 			<select class="form-control" id="group_id" name="group_id">
-				<#list c.availableGroups as group>
+				<#list c.availableGroups?sort_by("label") as group>
 					<option value="${group.id}">${group.label} - ${group.id}</option>
 				</#list>
 			</select>

diff --git a/...src/main/resources/com/bakdata/conquery/resources/admin/ui/templates/roleHandler.html.ftl b/...src/main/resources/com/bakdata/conquery/resources/admin/ui/templates/roleHandler.html.ftl
@@ -6,7 +6,7 @@
 		<div class="form-group">
 			<label for="role_id">Role:</label>
 			<select class="form-control" id="role_id" name="role_id">
-				<#list c.availableRoles as role>
+				<#list c.availableRoles?sort_by("label") as role>
 					<option value="${role.id}">${role.label} - ${role.id}</option>
 				</#list>
 			</select>