Skip to content

The Unified and Autonomous Development Platform

Fix the issues that issue can not be created

Robin Shen8a7f34a40e4d
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java
index a58be4a7a3..46fabd9e71 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java
@@ -80,6 +80,11 @@ public abstract class ParamSpec extends InputSpec {
super.setAllowEmpty(allowEmpty);
}
+ @Override
+ public String getNameOfEmptyValue() {
+ return null;
+ }
+
@Nullable
public static List<ParamSpec> list() {
Component component = ComponentContext.get().getComponent();
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java
index a7d2349429..338b2cf0b6 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java
@@ -109,6 +109,8 @@ public abstract class InputSpec implements Serializable {
this.allowEmpty = allowEmpty;
}
+ public abstract String getNameOfEmptyValue();
+
public List<String> getPossibleValues() {
return Lists.newArrayList();
}
@@ -142,9 +144,19 @@ public abstract class InputSpec implements Serializable {
}
public void appendCommonAnnotations(StringBuffer buffer, int index) {
- if (description != null) {
- buffer.append(" @Editable(name=\"" + escape(name) + "\", description=\"" +
- escape(description) + "\", order=" + index + ")\n");
+ if (description != null && getNameOfEmptyValue() != null) {
+ buffer.append(" @Editable(name=\"" + escape(name)
+ + "\", placeholder=\"" + escape(getNameOfEmptyValue())
+ + "\", description=\"" + escape(description)
+ + "\", order=" + index + ")\n");
+ } else if (description != null) {
+ buffer.append(" @Editable(name=\"" + escape(name)
+ + "\", description=\"" + escape(description)
+ + "\", order=" + index + ")\n");
+ } else if (getNameOfEmptyValue() != null) {
+ buffer.append(" @Editable(name=\"" + escape(name)
+ + "\", placeholder=\"" + escape(getNameOfEmptyValue())
+ + "\", order=" + index + ")\n");
} else {
buffer.append(" @Editable(name=\"" + escape(name) +
"\", order=" + index + ")\n");
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java
index ad4c5ba5b4..66fde86f5b 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java
@@ -159,13 +159,6 @@ public abstract class FieldSpec extends InputSpec {
return SuggestionUtils.suggestProjects(matchWith);
}
- @Override
- public void appendCommonAnnotations(StringBuffer buffer, int index) {
- super.appendCommonAnnotations(buffer, index);
- if (getNameOfEmptyValue() != null)
- buffer.append(" @NameOfEmptyValue(\"" + escape(getNameOfEmptyValue()) + "\")");
- }
-
private GlobalIssueSetting getIssueSetting() {
return OneDev.getInstance(SettingManager.class).getIssueSetting();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index dce4a1f2d0..58c012160b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -49,8 +49,6 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.Constants;
-import com.google.common.collect.Lists;
-
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
@@ -61,7 +59,6 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.imports.ProjectImporter;
import io.onedev.server.imports.ProjectImporterContribution;
import io.onedev.server.infomanager.CommitInfoManager;
-import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.StateSpec;
@@ -70,7 +67,6 @@ import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.search.entity.build.StatusCriteria;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryLexer;
-import io.onedev.server.search.entity.issue.ProjectCriteria;
import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.search.entity.project.ChildrenOfCriteria;
import io.onedev.server.search.entity.project.NameCriteria;
@@ -83,7 +79,6 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.ProjectBuildStats;
import io.onedev.server.util.ProjectIssueStats;
import io.onedev.server.util.ProjectPullRequestStats;
-import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.ProjectQueryBehavior;
@@ -1202,8 +1197,7 @@ public class ProjectListPanel extends Panel {
};
issueInfoFrag.setDefaultModel(totalCountModel);
- IssueQuery query = new IssueQuery(new ProjectCriteria(project.getPath()));
- PageParameters params = ProjectIssueListPage.paramsOf(project, query.toString(), 0);
+ PageParameters params = ProjectIssueListPage.paramsOf(project, null, 0);
Link<Void> issuesLink = new BookmarkablePageLink<Void>("issues", ProjectIssueListPage.class, params);
issuesLink.add(new Label("label", new AbstractReadOnlyModel<String>() {
@@ -1238,10 +1232,7 @@ public class ProjectListPanel extends Panel {
Project project = rowModel.getObject();
ProjectIssueStats stats = item.getModelObject();
StateSpec stateSpec = issueSetting.getStateSpecs().get(stats.getStateOrdinal());
- AndCriteria<Issue> criteria = new AndCriteria<>(Lists.newArrayList(
- new ProjectCriteria(project.getPath()),
- new StateCriteria(stateSpec.getName(), IssueQueryLexer.Is)));
- IssueQuery query = new IssueQuery(criteria);
+ IssueQuery query = new IssueQuery(new StateCriteria(stateSpec.getName(), IssueQueryLexer.Is));
PageParameters params = ProjectIssueListPage.paramsOf(project, query.toString(), 0);
Link<Void> stateLink = new BookmarkablePageLink<Void>("link", ProjectIssueListPage.class, params);
stateLink.add(new Label("label", stats.getStateCount() + " " + stateSpec.getName()));