Skip to content

The Unified and Autonomous Development Platform

Use field name instead of display name for built-in issue fields to avoid spaces

Robin Shen56a2104cf95d
diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.java
index 7202db3056..b2e06f160e 100644
--- a/core/src/main/java/io/onedev/server/model/Issue.java
+++ b/core/src/main/java/io/onedev/server/model/Issue.java
@@ -6,9 +6,11 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.annotation.Nullable;
import javax.persistence.CascadeType;
@@ -28,7 +30,6 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.util.MultiValueIssueField;
-import io.onedev.server.util.editable.EditableUtils;
import io.onedev.server.util.editable.annotation.Editable;
import io.onedev.server.util.editable.annotation.Markdown;
import io.onedev.server.util.inputspec.InputSpec;
@@ -46,7 +47,7 @@ public class Issue extends AbstractEntity {
private static final long serialVersionUID = 1L;
- public static final Map<String, String> BUILTIN_FIELDS = new HashMap<>();
+ public static final Set<String> BUILTIN_FIELDS = new HashSet<>();
static {
for (Method getter: BeanUtils.findGetters(Issue.class)) {
@@ -54,7 +55,7 @@ public class Issue extends AbstractEntity {
Field field = BeanUtils.findField(getter);
if (field != null && field.getAnnotation(ManyToOne.class) == null
&& field.getAnnotation(OneToMany.class) == null) {
- BUILTIN_FIELDS.put(EditableUtils.getDisplayName(field), field.getName());
+ BUILTIN_FIELDS.add(field.getName());
}
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
index 170f3e8342..bdb5c41643 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
@@ -41,12 +41,11 @@ public class IssueQuery implements Serializable {
List<Order> orders = new ArrayList<>();
for (IssueSort sort: sorts) {
- if (Issue.BUILTIN_FIELDS.containsKey(sort.getField())) {
- String fieldName = Issue.BUILTIN_FIELDS.get(sort.getField());
+ if (Issue.BUILTIN_FIELDS.contains(sort.getField())) {
if (sort.getDirection() == Direction.ASCENDING)
- orders.add(builder.asc(root.get(fieldName)));
+ orders.add(builder.asc(root.get(sort.getField())));
else
- orders.add(builder.desc(root.get(fieldName)));
+ orders.add(builder.desc(root.get(sort.getField())));
} else {
Join<Issue, IssueField> join = root.join("fields", JoinType.LEFT);
join.on(builder.equal(join.get("name"), sort.getField()));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java
index 029895fae2..921212a4f0 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java
@@ -162,7 +162,7 @@ abstract class FieldEditPanel extends Panel implements InputContext {
@Override
public boolean isReservedName(String inputName) {
- for (String displayName: Issue.BUILTIN_FIELDS.keySet()) {
+ for (String displayName: Issue.BUILTIN_FIELDS) {
if (displayName.equals(inputName))
return true;
}