Skip to content

The Unified and Autonomous Development Platform

Make validation message more friendly

robin shen1338d8418a86
diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.java
index 7ba3813401..52d6722805 100644
--- a/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.java
@@ -5,6 +5,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.hibernate.validator.constraints.NotEmpty;
+
import io.onedev.server.util.editable.annotation.ChoiceProvider;
import io.onedev.server.util.editable.annotation.Editable;
import io.onedev.server.util.inputspec.InputSpec;
@@ -29,6 +31,7 @@ public class StateSpec implements Serializable {
@Editable(order=100)
@Name
+ @NotEmpty
public String getName() {
return name;
}
@@ -46,7 +49,9 @@ public class StateSpec implements Serializable {
this.description = description;
}
- @Editable(order=250, description="Issue will be in this state after created if this option is enabled")
+ @Editable(order=250, description="Enable if this is an initial state. Issues will be in initial state after creation.<br>"
+ + "<b>NOTE: </b> If multiple initial states are defined, the last initial state with satisifed field "
+ + "requirements will be used")
public boolean isInitial() {
return initial;
}
@@ -64,9 +69,8 @@ public class StateSpec implements Serializable {
this.closed = closed;
}
- @Editable(order=500, description="Select issue fields attached to this state. "
- + "Attached fields will be prompted for user input when issue transits "
- + "to this state")
+ @Editable(order=500, name="Required Fields", description="Select issue fields required by this state. "
+ + "Required fields will be prompted for user input when issue transits to this state")
@ChoiceProvider("getFieldChoices")
public List<String> getFields() {
return fields;
diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateTransition.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateTransition.java
index 9304af55c4..1b26412199 100644
--- a/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateTransition.java
+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateTransition.java
@@ -1,14 +1,17 @@
package io.onedev.server.model.support.issueworkflow;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.validation.constraints.NotNull;
-
-import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.Size;
import io.onedev.server.model.support.issueworkflow.action.IssueAction;
+import io.onedev.server.util.editable.annotation.ChoiceProvider;
import io.onedev.server.util.editable.annotation.Editable;
+import io.onedev.server.web.page.project.setting.issueworkflow.IssueWorkflowPage;
+import io.onedev.server.web.util.WicketUtils;
@Editable
public class StateTransition implements Serializable {
@@ -24,6 +27,8 @@ public class StateTransition implements Serializable {
private IssueAction onAction;
@Editable(order=100)
+ @Size(min=1, message="At least one state needs to be specified")
+ @ChoiceProvider("getStateChoices")
public List<String> getFromStates() {
return fromStates;
}
@@ -33,7 +38,8 @@ public class StateTransition implements Serializable {
}
@Editable(order=200)
- @NotEmpty
+ @Size(min=1, message="At least one state needs to be specified")
+ @ChoiceProvider("getStateChoices")
public List<String> getToStates() {
return toStates;
}
@@ -62,4 +68,13 @@ public class StateTransition implements Serializable {
this.onAction = onAction;
}
+ @SuppressWarnings("unused")
+ private static List<String> getStateChoices() {
+ IssueWorkflowPage page = (IssueWorkflowPage) WicketUtils.getPage();
+ List<String> stateNames = new ArrayList<>();
+ for (StateSpec state: page.getWorkflow().getStates())
+ stateNames.add(state.getName());
+ return stateNames;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.java b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.java
index f7b976f9d7..6f41db2043 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.java
@@ -21,7 +21,7 @@ public class ValueIsNotAnyOf implements ValueMatcher {
@Editable
@ChoiceProvider("getValueChoices")
@OmitName
- @Size(min=1, max=100)
+ @Size(min=1, message="At least one value needs to be specified")
public List<String> getValues() {
return values;
}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java
index 789242d760..e80ce76804 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java
@@ -21,7 +21,7 @@ public class ValueIsOneOf implements ValueMatcher {
@Editable
@ChoiceProvider("getValueChoices")
@OmitName
- @Size(min=1, max=100)
+ @Size(min=1, message="At least one value needs to be specified")
public List<String> getValues() {
return values;
}
diff --git a/core/src/main/java/io/onedev/server/web/OneWebApplication.properties b/core/src/main/java/io/onedev/server/web/OneWebApplication.properties
new file mode 100644
index 0000000000..f253c6e58c
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/OneWebApplication.properties
@@ -0,0 +1 @@
+Required=${label} is required
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/comment/CodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/comment/CodeCommentPanel.java
index a55169363b..acfa1eaeaa 100644
--- a/core/src/main/java/io/onedev/server/web/component/comment/CodeCommentPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/comment/CodeCommentPanel.java
@@ -171,6 +171,7 @@ public abstract class CodeCommentPanel extends Panel {
};
form.add(contentInput);
contentInput.setRequired(true);
+ contentInput.setLabel(Model.of("Comment"));
NotificationPanel feedback = new NotificationPanel("feedback", form);
feedback.setOutputMarkupPlaceholderTag(true);
@@ -342,6 +343,7 @@ public abstract class CodeCommentPanel extends Panel {
};
contentInput.setRequired(true);
+ contentInput.setLabel(Model.of("Comment"));
form.add(contentInput);
NotificationPanel feedback = new NotificationPanel("feedback", form);
@@ -658,6 +660,7 @@ public abstract class CodeCommentPanel extends Panel {
};
contentInput.setRequired(true);
+ contentInput.setLabel(Model.of("Comment"));
form.add(contentInput);
NotificationPanel feedback = new NotificationPanel("feedback", form);
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 8bbbb7a17a..f8468e1ebe 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -861,6 +861,7 @@ public class RevisionDiffPanel extends Panel {
});
contentInput.setRequired(true);
+ contentInput.setLabel(Model.of("Comment"));
NotificationPanel feedback = new NotificationPanel("feedback", form);
feedback.setOutputMarkupPlaceholderTag(true);
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
index 514893eda3..d3aa4f468d 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
@@ -383,7 +383,8 @@ abstract class InsertUrlPanel extends Panel {
int maxFilesize = (int) (attachmentSupport.getAttachmentMaxSize()/1024/1024);
if (maxFilesize <= 0)
maxFilesize = 1;
- form.add(new DropzoneField("file", model, acceptedFiles, 1, maxFilesize).setRequired(true));
+ form.add(new DropzoneField("file", model, acceptedFiles, 1, maxFilesize)
+ .setRequired(true).setLabel(Model.of("Attachment")));
form.add(new AjaxButton("insert"){});
@@ -399,7 +400,8 @@ abstract class InsertUrlPanel extends Panel {
feedback.setOutputMarkupPlaceholderTag(true);
form.add(feedback);
- form.add(new DropzoneField("file", model, acceptedFiles, 1, Project.MAX_UPLOAD_SIZE).setRequired(true));
+ form.add(new DropzoneField("file", model, acceptedFiles, 1, Project.MAX_UPLOAD_SIZE)
+ .setRequired(true).setLabel(Model.of("Attachment")));
form.add(new TextField<String>("directory", new IModel<String>() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java
index 02224a6f14..1cc8f126e9 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java
@@ -12,6 +12,7 @@ import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.util.lang.Bytes;
@@ -62,7 +63,8 @@ abstract class BlobUploadPanel extends Panel {
form.add(feedback);
form.add(new DropzoneField("files",
- new PropertyModel<Collection<FileUpload>>(this, "uploads"), null, 0, Project.MAX_UPLOAD_SIZE).setRequired(true));
+ new PropertyModel<Collection<FileUpload>>(this, "uploads"), null, 0, Project.MAX_UPLOAD_SIZE)
+ .setRequired(true).setLabel(Model.of("File")));
form.add(new AjaxButton("upload") {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
index af7754be69..88061af106 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
@@ -469,7 +469,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe
}
});
- contentInput.setRequired(true);
+ contentInput.setRequired(true).setLabel(Model.of("Comment"));
NotificationPanel feedback = new NotificationPanel("feedback", form);
feedback.setOutputMarkupPlaceholderTag(true);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java
index cc1b903a82..4c6fcc4e67 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java
@@ -587,7 +587,7 @@ public class NewRequestPage extends ProjectPage implements CommentSupport {
}
});
- titleInput.setRequired(true);
+ titleInput.setRequired(true).setLabel(Model.of("Title"));
titleContainer.add(titleInput);
titleContainer.add(new NotificationPanel("feedback", titleInput));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewPage.java
index a6fe4aba42..da9d895b7b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/RequestOverviewPage.java
@@ -331,7 +331,7 @@ public class RequestOverviewPage extends RequestDetailPage {
}
};
- input.setRequired(true);
+ input.setRequired(true).setLabel(Model.of("Comment"));
form.add(input);
form.add(new NotificationPanel("feedback", input));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/CommentedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/CommentedPanel.java
index 83edfbf6e3..ae0eb87ac8 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/CommentedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/CommentedPanel.java
@@ -132,7 +132,7 @@ class CommentedPanel extends GenericPanel<PullRequestComment> {
}
};
- input.setRequired(true);
+ input.setRequired(true).setLabel(Model.of("Comment"));
form.add(input);
final long lastVersion = getComment().getVersion();
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
index 7f2d3cdb13..08b4cbdd2f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
@@ -46,7 +46,7 @@ public abstract class ProjectSettingPage extends ProjectPage {
tabs.add(new ProjectSettingTab("Authorizations", "fa fa-fw fa-user", ProjectAuthorizationsPage.class));
tabs.add(new ProjectSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionPage.class));
tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionPage.class));
- tabs.add(new ProjectSettingTab("Commit Message Transform", "fa fa-fw fa-exchange", CommitMessageTransformPage.class));
+ tabs.add(new ProjectSettingTab("Commit Message Transform", "fa fa-fw fa-comments", CommitMessageTransformPage.class));
tabs.add(new ProjectSettingTab("Issue Fields", "fa fa-fw fa-list-ul", IssueFieldsPage.class));
tabs.add(new ProjectSettingTab("Issue States", "fa fa-fw fa-check", IssueStatesPage.class));
return tabs;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java
index 461f3416ff..58689c8957 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java
@@ -100,7 +100,16 @@ public class IssueStatesPage extends IssueWorkflowPage {
});
- columns.add(new AbstractColumn<StateSpec, Void>(Model.of("Issue Closed")) {
+ columns.add(new AbstractColumn<StateSpec, Void>(Model.of("Initial")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, rowModel, rowModel.getObject().isInitial()?"Yes":"No", false));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<StateSpec, Void>(Model.of("Closed")) {
@Override
public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
@@ -194,7 +203,7 @@ public class IssueStatesPage extends IssueWorkflowPage {
@Override
protected void onInitialize() {
super.onInitialize();
- add(AttributeAppender.append("class", "issue-custom-state"));
+ add(AttributeAppender.append("class", "issue-state"));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css
index cbf0d27ad5..e8b7e293fe 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css
@@ -14,7 +14,7 @@
position: relative;
top: 0;
}
-#project-setting .issue-staets table>tbody>tr>td:first-child>div>.drag-handle {
+#project-setting .issue-states table>tbody>tr>td:first-child>div>.drag-handle {
position: absolute;
top: 8px;
}
@@ -22,9 +22,6 @@
margin-left: 16px;
}
-.floating.issue-state {
- width: 600px;
-}
.floating.issue-state .actions {
margin-bottom: 12px;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/test/Bean.java b/core/src/main/java/io/onedev/server/web/page/test/Bean.java
index dfb03cd1f6..d156695d28 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/Bean.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/Bean.java
@@ -1,25 +1,48 @@
package io.onedev.server.web.page.test;
import java.io.Serializable;
+import java.util.List;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.server.util.editable.annotation.ChoiceProvider;
import io.onedev.server.util.editable.annotation.Editable;
-import io.onedev.server.util.editable.annotation.Script;
@Editable
public class Bean implements Serializable {
private static final long serialVersionUID = 1L;
- private String script;
+ private String name;
+
+ private List<String> states;
- @Editable
- @Script
- public String getScript() {
- return script;
+ @Editable(order=100)
+ @NotNull
+ public String getName() {
+ return name;
}
- public void setScript(String script) {
- this.script = script;
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Editable(order=200)
+ @ChoiceProvider("getStateChoices")
+ @Size(min=1, message="At least one state must be defined")
+ public List<String> getStates() {
+ return states;
+ }
+
+ public void setStates(List<String> states) {
+ this.states = states;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getStateChoices() {
+ return Lists.newArrayList("Open", "Closed");
}
-
}
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index 3861deb6fa..6388d4440f 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,9 +1,9 @@
<wicket:extend>
<div class="center-box">
<form wicket:id="form">
- <div wicket:id="editor"></div>
+ <div wicket:id="feedback"></div>
+ <input wicket:id="content" name="Content" class="form-control"></input>
<button type="submit" class="btn btn-default">Submit</button>
</form>
- <div wicket:id="viewer"></div>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index d32cb2889a..78ed0ceba2 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -1,8 +1,10 @@
package io.onedev.server.web.page.test;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.Model;
-import io.onedev.server.web.editable.BeanContext;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.web.page.base.BasePage;
@SuppressWarnings("serial")
@@ -12,16 +14,13 @@ public class TestPage extends BasePage {
protected void onInitialize() {
super.onInitialize();
- Bean bean = new Bean();
- Form<?> form = new Form<Void>("form") {
-
- };
- form.add(BeanContext.editBean("editor", bean));
+ Form<?> form = new Form<Void>("form");
+ form.add(new NotificationPanel("feedback", form));
+ TextField<String> content = new TextField<String>("content");
+ content.setRequired(true);
+ content.setLabel(Model.of("Content"));
+ form.add(content);
add(form);
-
- bean.setScript("public class Test {}");
-
- add(BeanContext.viewBean("viewer", bean));
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java b/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java
index 335ef80136..976c2a64f5 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java
@@ -10,6 +10,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Bytes;
@@ -51,7 +52,7 @@ public class AvatarEditPage extends UserPage {
IModel<Collection<FileUpload>> model = new PropertyModel<>(this, "uploads");
DropzoneField dropzoneField = new DropzoneField("file", model, "image/*", 1, MAX_IMAGE_SIZE);
- dropzoneField.setRequired(true);
+ dropzoneField.setRequired(true).setLabel(Model.of("Image"));
form.add(dropzoneField);
form.add(new AjaxButton("useUploaded") {