From 282b8fd82c46ba6874fb24c8715af103645f3406 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Thu, 10 Apr 2014 18:58:08 -0400
Subject: [PATCH] Fix message formatting
---
src/main/java/com/gitblit/wicket/pages/EditTicketPage.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
index b500486..00cd47d 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
@@ -108,7 +108,7 @@
topicModel = Model.of(ticket.topic == null ? "" : ticket.topic);
responsibleModel = Model.of();
milestoneModel = Model.of();
- mergeToModel = Model.of(ticket.mergeTo == null ? "" : ticket.mergeTo);
+ mergeToModel = Model.of(ticket.mergeTo == null ? getRepositoryModel().mergeTo : ticket.mergeTo);
statusModel = Model.of(ticket.status);
setStatelessHint(false);
@@ -309,8 +309,8 @@
branches.add(Repository.shortenRefName(branch));
}
}
- branches.remove(Repository.shortenRefName(getRepositoryModel().HEAD));
- branches.add(0, Repository.shortenRefName(getRepositoryModel().HEAD));
+ branches.remove(Repository.shortenRefName(getRepositoryModel().mergeTo));
+ branches.add(0, Repository.shortenRefName(getRepositoryModel().mergeTo));
Fragment mergeto = new Fragment("mergeto", "mergeToFragment", this);
mergeto.add(new DropDownChoice<String>("mergeto", mergeToModel, branches));
--
Gitblit v1.9.1