From 1cfce55191f8ae63b1830892fc0883506fd8507d Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 23 Apr 2014 12:06:59 -0400 Subject: [PATCH] Improve pages servlet raw navigation (issue-411) --- src/main/java/com/gitblit/wicket/pages/EditTicketPage.java | 9 ++++++--- 1 files changed, 6 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..64c0648 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java +++ b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java @@ -101,6 +101,9 @@ || !currentUser.canEdit(ticket, getRepositoryModel()) || !app().tickets().isAcceptingTicketUpdates(getRepositoryModel())) { setResponsePage(TicketsPage.class, WicketUtils.newObjectParameter(repositoryName, "" + ticketId)); + + // create a placeholder object so we don't trigger NPEs + ticket = new TicketModel(); } typeModel = Model.of(ticket.type); @@ -108,7 +111,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 +312,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