Fix subdirectory links in pages servlet (issue-411)

James Moger

2014-04-23 ddaed96036ebf82430e09ad62ff9f7a7dc828dfe

 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));