From f11592770694e9d0a391a31fa23f455bc05756c1 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 31 Oct 2014 09:22:01 -0400
Subject: [PATCH] Merged #212 "Gracefully handle missing integration branch in ticket page"
---
src/main/java/com/gitblit/wicket/pages/EditTicketPage.java | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
index bd2ec63..7c02c0b 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
@@ -50,10 +50,9 @@
import com.gitblit.tickets.TicketResponsible;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
-import com.gitblit.wicket.SafeTextModel;
-import com.gitblit.wicket.SafeTextModel.Mode;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.MarkdownTextArea;
+import com.google.common.base.Optional;
/**
* Page for editing a ticket.
@@ -84,6 +83,10 @@
private IModel<TicketMilestone> milestoneModel;
private Label descriptionPreview;
+
+ private IModel<TicketModel.Priority> priorityModel;
+
+ private IModel<TicketModel.Severity> severityModel;
public EditTicketPage(PageParameters params) {
super(params);
@@ -112,12 +115,14 @@
}
typeModel = Model.of(ticket.type);
- titleModel = SafeTextModel.none(ticket.title);
- topicModel = SafeTextModel.none(ticket.topic == null ? "" : ticket.topic);
+ titleModel = Model.of(ticket.title);
+ topicModel = Model.of(ticket.topic == null ? "" : ticket.topic);
responsibleModel = Model.of();
milestoneModel = Model.of();
mergeToModel = Model.of(ticket.mergeTo == null ? getRepositoryModel().mergeTo : ticket.mergeTo);
statusModel = Model.of(ticket.status);
+ priorityModel = Model.of(ticket.priority);
+ severityModel = Model.of(ticket.severity);
setStatelessHint(false);
setOutputMarkupId(true);
@@ -136,7 +141,7 @@
form.add(new TextField<String>("title", titleModel));
form.add(new TextField<String>("topic", topicModel));
- final SafeTextModel markdownPreviewModel = new SafeTextModel(Mode.none);
+ final IModel<String> markdownPreviewModel = Model.of(ticket.body == null ? "" : ticket.body);
descriptionPreview = new Label("descriptionPreview", markdownPreviewModel);
descriptionPreview.setEscapeModelStrings(false);
descriptionPreview.setOutputMarkupId(true);
@@ -220,6 +225,14 @@
milestone.add(new DropDownChoice<TicketMilestone>("milestone", milestoneModel, milestones));
form.add(milestone.setVisible(!milestones.isEmpty()));
+ // priority
+ List<TicketModel.Priority> priorityChoices = Arrays.asList(TicketModel.Priority.choices());
+ form.add(new DropDownChoice<TicketModel.Priority>("priority", priorityModel, priorityChoices));
+
+ // severity
+ List<TicketModel.Severity> severityChoices = Arrays.asList(TicketModel.Severity.choices());
+ form.add(new DropDownChoice<TicketModel.Severity>("severity", severityModel, severityChoices));
+
// mergeTo (integration branch)
List<String> branches = new ArrayList<String>();
for (String branch : getRepositoryModel().getLocalBranches()) {
@@ -270,7 +283,7 @@
change.setField(Field.title, title);
}
- String description = descriptionEditor.getText();
+ String description = Optional.fromNullable(descriptionEditor.getText()).or("");
if ((StringUtils.isEmpty(ticket.body) && !StringUtils.isEmpty(description))
|| (!StringUtils.isEmpty(ticket.body) && !ticket.body.equals(description))) {
// description change
@@ -289,9 +302,9 @@
change.setField(Field.type, type);
}
- String topic = topicModel.getObject();
+ String topic = Optional.fromNullable(topicModel.getObject()).or("");
if ((StringUtils.isEmpty(ticket.topic) && !StringUtils.isEmpty(topic))
- || (!StringUtils.isEmpty(topic) && !topic.equals(ticket.topic))) {
+ || (!StringUtils.isEmpty(ticket.topic) && !ticket.topic.equals(topic))) {
// topic change
change.setField(Field.topic, topic);
}
@@ -316,7 +329,19 @@
change.setField(Field.milestone, milestone.name);
}
}
+
+ TicketModel.Priority priority = priorityModel.getObject();
+ if (!ticket.priority.equals(priority))
+ {
+ change.setField(Field.priority, priority);
+ }
+ TicketModel.Severity severity = severityModel.getObject();
+ if (!ticket.severity.equals(severity))
+ {
+ change.setField(Field.severity, severity);
+ }
+
String mergeTo = mergeToModel.getObject();
if ((StringUtils.isEmpty(ticket.mergeTo) && !StringUtils.isEmpty(mergeTo))
|| (!StringUtils.isEmpty(mergeTo) && !mergeTo.equals(ticket.mergeTo))) {
@@ -332,13 +357,13 @@
if (ticket != null) {
TicketNotifier notifier = app().tickets().createNotifier();
notifier.sendMailing(ticket);
- setResponsePage(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));
+ redirectTo(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));
} else {
// TODO error
}
} else {
// nothing to change?!
- setResponsePage(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));
+ redirectTo(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));
}
}
});
--
Gitblit v1.9.1