Gracefully handle missing integration branch in ticket page

James Moger

2014-10-31 4a2fb11479c9b53ffe4e2e1cca82205ca122753b

 src/main/java/com/gitblit/wicket/pages/TicketPage.java

@@ -519,10 +519,10 @@
       * TICKET METADATA

       */

      add(new Label("ticketType", ticket.type.toString()));

		


      add(new Label("priority", ticket.priority.toString()));

      add(new Label("severity", ticket.severity.toString()));

		


      if (StringUtils.isEmpty(ticket.topic)) {

         add(new Label("ticketTopic").setVisible(false));

      } else {

@@ -531,8 +531,8 @@
         String safeTopic = app().xssFilter().relaxed(topic);

         add(new Label("ticketTopic", safeTopic).setEscapeModelStrings(false));

      }

		
		








      /*

@@ -1431,6 +1431,12 @@
            Fragment mergePanel = new Fragment("mergePanel", "alreadyMergedFragment", this);

            mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetAlreadyMerged"), ticket.mergeTo)));

            return mergePanel;

         } else if (MergeStatus.MISSING_INTEGRATION_BRANCH == mergeStatus) {

            // target/integration branch is missing

            Fragment mergePanel = new Fragment("mergePanel", "notMergeableFragment", this);

            mergePanel.add(new Label("mergeTitle", MessageFormat.format(getString("gb.patchsetNotMergeable"), ticket.mergeTo)));

            mergePanel.add(new Label("mergeMore", MessageFormat.format(getString("gb.missingIntegrationBranchMore"), ticket.mergeTo)));

            return mergePanel;

         } else {

            // patchset can not be cleanly merged

            Fragment mergePanel = new Fragment("mergePanel", "notMergeableFragment", this);