From 667163976e4e51fc3ebf191525e44d97c8a724dc Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 01 May 2014 14:31:18 -0400
Subject: [PATCH] Overdue labeling, notify changed tickets control
---
src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java
index d6e34cb..a9f76d3 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java
@@ -22,6 +22,7 @@
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.extensions.markup.html.form.DateTextField;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
@@ -78,6 +79,7 @@
form.add(new TextField<String>("name", nameModel));
form.add(new DateTextField("due", dueModel, "yyyy-MM-dd"));
+ form.add(new Label("dueFormat", "yyyy-MM-dd"));
form.add(new AjaxButton("create") {
@@ -87,6 +89,13 @@
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
String name = nameModel.getObject();
if (StringUtils.isEmpty(name)) {
+ // invalid name
+ return;
+ }
+
+ TicketMilestone milestone = app().tickets().getMilestone(getRepositoryModel(), name);
+ if (milestone != null) {
+ // milestone already exists
return;
}
@@ -95,7 +104,7 @@
UserModel currentUser = GitBlitWebSession.get().getUser();
String createdBy = currentUser.username;
- TicketMilestone milestone = app().tickets().createMilestone(getRepositoryModel(), name, createdBy);
+ milestone = app().tickets().createMilestone(getRepositoryModel(), name, createdBy);
if (milestone != null) {
milestone.due = due;
app().tickets().updateMilestone(getRepositoryModel(), milestone, createdBy);
--
Gitblit v1.9.1