Skip to content

The Unified and Autonomous Development Platform

Fix issue #451 - Able to specify applicable projects for each value of Enumeration issue field

Robin Shen5982aac700df
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index 9635380e30..f0d1b928fe 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -605,7 +605,7 @@ public class GlobalIssueSetting implements Serializable {
public Collection<String> getPrimaryFields(Project project) {
Matcher matcher = new PathMatcher();
return getFieldSpecs().stream()
- .filter(it->PatternSet.parse(it.getPrimaryProjects()).matches(matcher, project.getName()))
+ .filter(it->PatternSet.parse(it.getPrimaryProjects()).matches(matcher, project.getPath()))
.map(it->it.getName())
.collect(Collectors.toList());
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java
index 49121c9cb9..4b8d4bcafd 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java
@@ -1,11 +1,16 @@
package io.onedev.server.model.support.inputspec.choiceinput.choiceprovider;
import java.io.Serializable;
+import java.util.List;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.web.editable.annotation.Color;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.web.util.SuggestionUtils;
@Editable(name="Value")
public class Choice implements Serializable {
@@ -15,6 +20,8 @@ public class Choice implements Serializable {
private String value;
private String color = "#0d87e9";
+
+ private String applicableProjects;
@Editable(order=100)
@NotEmpty
@@ -36,5 +43,22 @@ public class Choice implements Serializable {
public void setColor(String color) {
this.color = color;
}
+
+ @Editable(order=300, description="Specify applicable projects for this choice separated by space. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty for all projects")
+ @Patterns(suggester="suggestProjects", path=true)
+ @NameOfEmptyValue("All projects")
+ public String getApplicableProjects() {
+ return applicableProjects;
+ }
+
+ public void setApplicableProjects(String applicableProjects) {
+ this.applicableProjects = applicableProjects;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestProjects(String matchWith) {
+ return SuggestionUtils.suggestProjects(matchWith);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
index 2b8066958a..72be020e56 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
@@ -13,8 +13,12 @@ import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.Size;
import io.onedev.server.buildspec.param.spec.ChoiceParam;
+import io.onedev.server.model.Project;
import io.onedev.server.model.support.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.ChoiceField;
+import io.onedev.server.util.match.Matcher;
+import io.onedev.server.util.match.PathMatcher;
+import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.Editable;
@@ -42,8 +46,14 @@ public class SpecifiedChoices extends ChoiceProvider implements Validatable {
@Override
public Map<String, String> getChoices(boolean allPossible) {
Map<String, String> choices = new LinkedHashMap<>();
- for (Choice choice: getChoices())
- choices.put(choice.getValue(), choice.getColor());
+ Project project = Project.get();
+ Matcher matcher = new PathMatcher();
+ for (Choice choice: getChoices()) {
+ if (project == null || choice.getApplicableProjects() == null
+ || PatternSet.parse(choice.getApplicableProjects()).matches(matcher, project.getPath())) {
+ choices.put(choice.getValue(), choice.getColor());
+ }
+ }
return choices;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/param-spec.css b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/param-spec.css
index 8b7b4c4543..4b3b53fe93 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/param-spec.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/param-spec.css
@@ -16,6 +16,7 @@
border-radius: 0.42rem 0.42rem 0 0;
}
.floating.param-spec .property-choices thead, .param-spec-edit .property-choices thead,
+.floating.param-spec .property-applicableProjects, .param-spec-edit .property-applicableProjects,
.floating.param-spec .property-color, .param-spec-edit .property-color {
display: none;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java
index 597b4258b8..a181f94d9b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java
@@ -59,6 +59,11 @@ public class IssueFieldListPage extends IssueSettingPage {
add(new ModalLink("addNew") {
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
@Override
protected Component newContent(String id, ModalPanel modal) {
return new FieldEditPanel(id, -1) {
@@ -134,6 +139,11 @@ public class IssueFieldListPage extends IssueSettingPage {
Fragment fragment = new Fragment(componentId, "actionColumnFrag", IssueFieldListPage.this);
fragment.add(new ModalLink("edit") {
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
@Override
protected Component newContent(String id, ModalPanel modal) {
return new FieldEditPanel(id, fieldIndex) {