Skip to content

The Unified and Autonomous Development Platform

fix: Sort roles by name in role picker (OD-2338)

Robin Shen8fbf8e465a0e
diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.java
index 1415adf544..3001361b96 100644
--- a/server-core/src/main/java/io/onedev/server/model/Role.java
+++ b/server-core/src/main/java/io/onedev/server/model/Role.java
@@ -36,6 +36,7 @@ public class Role extends AbstractEntity implements BasePermission {
private static final long serialVersionUID = 1L;
+ public static final String PROP_NAME = "name";
public static final Long OWNER_ID = 1L;
@Column(nullable=false, unique=true)
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java
index 5fe9a856c2..334aaa888d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java
@@ -8,10 +8,12 @@ import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
+import org.hibernate.criterion.Order;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.RoleManager;
import io.onedev.server.model.Role;
+import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.web.component.stringchoice.StringSingleChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
@@ -30,7 +32,10 @@ public class RoleSingleChoiceEditor extends PropertyEditor<String> {
super.onInitialize();
Map<String, String> roleNames = new LinkedHashMap<>();
- for (Role role: OneDev.getInstance(RoleManager.class).query())
+
+ var criteria = EntityCriteria.of(Role.class);
+ criteria.addOrder(Order.asc(Role.PROP_NAME));
+ for (Role role: OneDev.getInstance(RoleManager.class).query(criteria))
roleNames.put(role.getName(), role.getName());
String selection = getModelObject();