The Unified and Autonomous Development Platform
Specify default values for issue fields of the default workflow
Robin Shen3a6401b173b8
diff --git a/core/src/main/java/io/onedev/server/exception/ScriptException.java b/core/src/main/java/io/onedev/server/exception/ScriptException.javaindex 2fa19c7ba8..956116d6e5 100644--- a/core/src/main/java/io/onedev/server/exception/ScriptException.java+++ b/core/src/main/java/io/onedev/server/exception/ScriptException.java@@ -5,7 +5,7 @@ public class ScriptException extends OneException {private static final long serialVersionUID = 1L;public ScriptException(String script, RuntimeException cause) {- super("Error evaluating script:\n" + script, cause);+ super("Error evaluating groovy script:\n" + script, cause);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.javaindex b976a526dc..be091d5c22 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java@@ -21,6 +21,7 @@ import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.Choice;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.util.inputspec.issuechoiceinput.IssueChoiceInput;import io.onedev.server.util.inputspec.showcondition.ShowCondition;import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;@@ -68,6 +69,10 @@ public class IssueWorkflow implements Serializable {specifiedChoices.setChoices(choices);type.setChoiceProvider(specifiedChoices);+ SpecifiedDefaultValue specifiedDefaultValue = new SpecifiedDefaultValue();+ specifiedDefaultValue.setValue("Bug");+ type.setDefaultValueProvider(specifiedDefaultValue);+fieldSpecs.add(type);ChoiceInput priority = new ChoiceInput();@@ -94,6 +99,10 @@ public class IssueWorkflow implements Serializable {specifiedChoices.setChoices(choices);priority.setChoiceProvider(specifiedChoices);+ specifiedDefaultValue = new SpecifiedDefaultValue();+ specifiedDefaultValue.setValue("Normal");+ priority.setDefaultValueProvider(specifiedDefaultValue);+fieldSpecs.add(priority);UserChoiceInput assignee = new UserChoiceInput();@@ -115,7 +124,7 @@ public class IssueWorkflow implements Serializable {choices.add(fixed);Choice wontFix = new Choice();- wontFix.setValue("Won't Fix");+ wontFix.setValue("Invalid");choices.add(wontFix);Choice duplicated = new Choice();@@ -125,6 +134,10 @@ public class IssueWorkflow implements Serializable {specifiedChoices.setChoices(choices);resolution.setChoiceProvider(specifiedChoices);+ specifiedDefaultValue = new SpecifiedDefaultValue();+ specifiedDefaultValue.setValue("Fixed");+ resolution.setDefaultValueProvider(specifiedDefaultValue);+fieldSpecs.add(resolution);IssueChoiceInput duplicateIssue = new IssueChoiceInput();diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javaindex aea74e52bf..7778e7b765 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java@@ -227,7 +227,7 @@ public abstract class InputSpec implements Serializable {public static Class<?> defineClass(String className, List<InputSpec> inputs) {StringBuffer buffer = new StringBuffer();buffer.append("import org.apache.commons.lang3.SerializationUtils;\n");- buffer.append("import io.onedev.server.util.editable.annotation.*;\n");+ buffer.append("import io.onedev.server.web.editable.annotation.*;\n");buffer.append("import io.onedev.util.*;\n");buffer.append("import io.onedev.server.util.*;\n");buffer.append("import io.onedev.server.util.facade.*;\n");diff --git a/core/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.html b/core/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.htmlindex 5aaef10f91..b8c5cf62fa 100644--- a/core/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.html+++ b/core/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.html@@ -1,6 +1,6 @@<wicket:extend><div wicket:id="error" class="wide center-box">- <pre wicket:id="title" class="title"></pre>+ <div wicket:id="title" class="title"></div><div class="actions"><a wicket:id="home" class="btn btn-primary">Back to home</a><a wicket:id="showDetail" class="btn btn-primary">Show Error Detail</a>diff --git a/core/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.java b/core/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.javaindex 66266bc316..462fd7d39a 100644--- a/core/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.java+++ b/core/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.java@@ -1,5 +1,6 @@package io.onedev.server.web.page.error;+import org.apache.commons.lang3.StringUtils;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -32,7 +33,7 @@ public class ExpectedExceptionPage extends BaseErrorPage {container.setOutputMarkupId(true);add(container);- container.add(new Label("title", title));+ container.add(new Label("title", StringUtils.abbreviate(title, 80)));container.add(new ViewStateAwarePageLink<Void>("home", ProjectListPage.class));