Skip to content

The Unified and Autonomous Development Platform

Improve issue template handling

Robin Shen6718c752045b
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java
index dc60115a5e..4532b633a6 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java
@@ -105,9 +105,9 @@ public class AndIssueCriteria extends IssueCriteria {
}
@Override
- public void fill(Issue issue, Set<String> initedLists) {
+ public void fill(Issue issue) {
for (IssueCriteria criteria: criterias)
- criteria.fill(issue, initedLists);
+ criteria.fill(issue);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
index 565c41219c..0d159b582b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
@@ -1,7 +1,6 @@
package io.onedev.server.search.entity.issue;
import java.util.Objects;
-import java.util.Set;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Join;
@@ -40,7 +39,7 @@ public class BooleanFieldCriteria extends FieldCriteria {
}
@Override
- public void fill(Issue issue, Set<String> initedLists) {
+ public void fill(Issue issue) {
issue.setFieldValue(getFieldName(), value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java
index c27aaaf2f3..14e682dc9b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.issue;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Objects;
import javax.annotation.Nullable;
@@ -22,10 +24,13 @@ public class BuildFieldCriteria extends FieldCriteria {
private final String value;
- public BuildFieldCriteria(String name, @Nullable Project project, String value) {
+ private final boolean allowMultiple;
+
+ public BuildFieldCriteria(String name, @Nullable Project project, String value, boolean allowMultiple) {
super(name);
build = EntityQuery.getBuild(project, value);
this.value = value;
+ this.allowMultiple = allowMultiple;
}
@Override
@@ -41,6 +46,20 @@ public class BuildFieldCriteria extends FieldCriteria {
return issue.getProject().equals(build.getProject()) && Objects.equals(fieldValue, build.getNumber());
}
+ @SuppressWarnings({"unchecked" })
+ @Override
+ public void fill(Issue issue) {
+ if (allowMultiple) {
+ List<Long> valueFromIssue = (List<Long>) issue.getFieldValue(getFieldName());
+ if (valueFromIssue == null)
+ valueFromIssue = new ArrayList<>();
+ valueFromIssue.add(build.getNumber());
+ issue.setFieldValue(getFieldName(), valueFromIssue);
+ } else {
+ issue.setFieldValue(getFieldName(), build.getNumber());
+ }
+ }
+
@Override
public String asString() {
return quote(getFieldName()) + " "
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
index a293a37670..6a23833dbf 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
@@ -5,7 +5,6 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
-import java.util.Set;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Join;
@@ -16,7 +15,6 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
@@ -96,23 +94,15 @@ public class ChoiceFieldCriteria extends FieldCriteria {
return false;
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({"unchecked" })
@Override
- public void fill(Issue issue, Set<String> initedLists) {
+ public void fill(Issue issue) {
if (allowMultiple) {
- List list;
- if (!initedLists.contains(getFieldName())) {
- list = new ArrayList();
- issue.setFieldValue(getFieldName(), list);
- initedLists.add(getFieldName());
- } else {
- list = (List) issue.getFieldValue(getFieldName());
- if (list == null) {
- list = new ArrayList();
- issue.setFieldValue(getFieldName(), list);
- }
- }
- list.add(value);
+ List<String> valueFromIssue = (List<String>) issue.getFieldValue(getFieldName());
+ if (valueFromIssue == null)
+ valueFromIssue = new ArrayList<>();
+ valueFromIssue.add(value);
+ issue.setFieldValue(getFieldName(), valueFromIssue);
} else {
issue.setFieldValue(getFieldName(), value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
index 07a0403518..a1b9330815 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
@@ -5,7 +5,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
-import java.util.Set;
import java.util.stream.Collectors;
import javax.persistence.criteria.CriteriaBuilder;
@@ -162,26 +161,18 @@ public class FieldOperatorCriteria extends FieldCriteria {
return quote(getFieldName()) + " " + IssueQuery.getRuleName(operator);
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({"unchecked" })
@Override
- public void fill(Issue issue, Set<String> initedLists) {
+ public void fill(Issue issue) {
if (operator == IssueQueryLexer.IsEmpty) {
issue.setFieldValue(getFieldName(), null);
} else if (operator == IssueQueryLexer.IsMe) {
if (allowMultiple) {
- List list;
- if (!initedLists.contains(getFieldName())) {
- list = new ArrayList();
- issue.setFieldValue(getFieldName(), list);
- initedLists.add(getFieldName());
- } else {
- list = (List) issue.getFieldValue(getFieldName());
- if (list == null) {
- list = new ArrayList();
- issue.setFieldValue(getFieldName(), list);
- }
- }
- list.add(SecurityUtils.getUser().getName());
+ List<String> valueFromIssue = (List<String>) issue.getFieldValue(getFieldName());
+ if (valueFromIssue == null)
+ valueFromIssue = new ArrayList<>();
+ valueFromIssue.add(SecurityUtils.getUser().getName());
+ issue.setFieldValue(getFieldName(), valueFromIssue);
} else {
issue.setFieldValue(getFieldName(), SecurityUtils.getUser().getName());
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
index dd1fc91592..cca3d98fec 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
@@ -3,7 +3,6 @@ package io.onedev.server.search.entity.issue;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import javax.annotation.Nullable;
@@ -16,11 +15,7 @@ public abstract class IssueCriteria extends EntityCriteria<Issue> {
private static final long serialVersionUID = 1L;
- public final void fill(Issue issue) {
- fill(issue, new HashSet<>());
- }
-
- public void fill(Issue issue, Set<String> initedLists) {
+ public void fill(Issue issue) {
}
public Collection<String> getUndefinedStates() {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java
index 56cdfb19fd..771fbfb273 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java
@@ -10,7 +10,6 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
import io.onedev.server.model.Project;
-
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.query.IssueQueryConstants;
@@ -41,6 +40,11 @@ public class IssueFieldCriteria extends FieldCriteria {
return issue.getProject().equals(this.issue.getProject()) && Objects.equals(fieldValue, this.issue.getNumber());
}
+ @Override
+ public void fill(Issue issue) {
+ issue.setFieldValue(getFieldName(), this.issue.getNumber());
+ }
+
@Override
public String asString() {
return quote(getFieldName()) + " "
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index 77b8d152b5..6029c2d900 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -238,7 +238,7 @@ public class IssueQuery extends EntityQuery<Issue> {
if (field instanceof IssueChoiceField) {
return new IssueFieldCriteria(fieldName, project, value);
} else if (field instanceof BuildChoiceField) {
- return new BuildFieldCriteria(fieldName, project, value);
+ return new BuildFieldCriteria(fieldName, project, value, field.isAllowMultiple());
} else if (field instanceof PullRequestChoiceField) {
return new PullRequestFieldCriteria(fieldName, project, value);
} else if (field instanceof CommitField) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
index 1451637a96..a9b218bf8b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
@@ -1,7 +1,5 @@
package io.onedev.server.search.entity.issue;
-import java.util.Set;
-
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
@@ -46,7 +44,7 @@ public class MilestoneCriteria extends IssueCriteria {
}
@Override
- public void fill(Issue issue, Set<String> initedLists) {
+ public void fill(Issue issue) {
issue.setMilestone(issue.getProject().getMilestone(milestoneName));
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java
index e338efb6b0..69065b9886 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java
@@ -1,7 +1,6 @@
package io.onedev.server.search.entity.issue;
import java.util.Objects;
-import java.util.Set;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Join;
@@ -56,7 +55,7 @@ public class NumericFieldCriteria extends FieldCriteria {
}
@Override
- public void fill(Issue issue, Set<String> initedLists) {
+ public void fill(Issue issue) {
issue.setFieldValue(getFieldName(), value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java
index 7415af8443..61670ab5e5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java
@@ -11,7 +11,6 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.query.IssueQueryConstants;
@@ -42,6 +41,11 @@ public class PullRequestFieldCriteria extends FieldCriteria {
return issue.getProject().equals(request.getTargetProject()) && Objects.equals(fieldValue, request.getNumber());
}
+ @Override
+ public void fill(Issue issue) {
+ issue.setFieldValue(getFieldName(), request.getNumber());
+ }
+
@Override
public String asString() {
return quote(getFieldName()) + " "
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
index 6a89d82800..afebd167c7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
@@ -3,7 +3,6 @@ package io.onedev.server.search.entity.issue;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.Set;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
@@ -13,7 +12,6 @@ import javax.persistence.criteria.Root;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
-
import io.onedev.server.util.query.IssueQueryConstants;
public class StateCriteria extends IssueCriteria {
@@ -38,7 +36,7 @@ public class StateCriteria extends IssueCriteria {
}
@Override
- public void fill(Issue issue, Set<String> initedLists) {
+ public void fill(Issue issue) {
issue.setState(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
index d7da86e915..8714f49dfd 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
@@ -1,7 +1,5 @@
package io.onedev.server.search.entity.issue;
-import java.util.Set;
-
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.Path;
@@ -55,7 +53,7 @@ public class StringFieldCriteria extends FieldCriteria {
}
@Override
- public void fill(Issue issue, Set<String> initedLists) {
+ public void fill(Issue issue) {
if (operator == IssueQueryLexer.Is)
issue.setFieldValue(getFieldName(), value);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js b/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js
index 91b58b9788..286e3617db 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js
@@ -1,9 +1,9 @@
onedev.server.buildChoiceFormatter = {
formatBuild: function(build) {
if (build.version)
- return "<div class='build'>#" + build.number + " (" + build.version + ") : " + build.jobName + "</div>";
+ return "<span class='build'>#" + build.number + " (" + build.version + ") : " + build.jobName + "</span>";
else
- return "<div class='build'>#" + build.number + " : " + build.jobName + "</div>";
+ return "<span class='build'>#" + build.number + " : " + build.jobName + "</span>";
},
formatSelection: function(build) {
return onedev.server.buildChoiceFormatter.formatBuild(build);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
index a46cabc6fb..dedd11df8a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
@@ -36,10 +36,8 @@ import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.issue.TransitionSpec;
-import io.onedev.server.issue.fieldspec.ChoiceField;
import io.onedev.server.issue.fieldspec.DateField;
import io.onedev.server.issue.fieldspec.FieldSpec;
-import io.onedev.server.issue.fieldspec.UserChoiceField;
import io.onedev.server.issue.transitiontrigger.PressButtonTrigger;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
@@ -202,16 +200,10 @@ public abstract class IssueOperationsPanel extends Panel {
criterias.add(Criteria.quote(entry.getKey()) + " " + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty));
} else {
FieldSpec field = issueSetting.getFieldSpec(entry.getKey());
- if (field instanceof ChoiceField && ((ChoiceField)field).isAllowMultiple()) {
+ if (field.isAllowMultiple()) {
for (String string: strings) {
criterias.add(Criteria.quote(entry.getKey()) + " "
- + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "
- + Criteria.quote(string));
- }
- } else if (field instanceof UserChoiceField && ((UserChoiceField)field).isAllowMultiple()) {
- for (String string: strings) {
- criterias.add(Criteria.quote(entry.getKey()) + " "
- + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "
+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
+ Criteria.quote(string));
}
} else if (!(field instanceof DateField)) {