Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

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

@@ -272,6 +272,16 @@
                  sortBy,

                  desc,

                  1)));

		
      add(new BookmarkablePageLink<Void>("maintenanceQuery", TicketsPage.class,

            queryParameters(

                  Lucene.type.matches(TicketModel.Type.Maintenance.name()),

                  milestoneParam,

                  statiiParam,

                  assignedToParam,

                  sortBy,

                  desc,

                  1)));



      add(new BookmarkablePageLink<Void>("resetQuery", TicketsPage.class,

            queryParameters(

@@ -454,7 +464,11 @@
      sortChoices.add(new TicketSort(getString("gb.sortLeastPatchsetRevisions"), Lucene.patchsets.name(), false));

      sortChoices.add(new TicketSort(getString("gb.sortMostVotes"), Lucene.votes.name(), true));

      sortChoices.add(new TicketSort(getString("gb.sortLeastVotes"), Lucene.votes.name(), false));



      sortChoices.add(new TicketSort(getString("gb.sortHighestPriority"), Lucene.priority.name(), true));

      sortChoices.add(new TicketSort(getString("gb.sortLowestPriority"), Lucene.priority.name(), false));

      sortChoices.add(new TicketSort(getString("gb.sortHighestSeverity"), Lucene.severity.name(), true));

      sortChoices.add(new TicketSort(getString("gb.sortLowestSeverity"), Lucene.severity.name(), false));

		
      TicketSort currentSort = sortChoices.get(0);

      for (TicketSort ts : sortChoices) {

         if (ts.sortBy.equals(sortBy) && desc == ts.desc) {

@@ -536,7 +550,13 @@
            item.add(entryPanel);



            final TicketMilestone tm = item.getModelObject();

            PageParameters params = queryParameters(null, tm.name, null, null, null, true, 1);

            String [] states;

            if (tm.isOpen()) {

               states = TicketsUI.openStatii;

            } else {

               states = TicketsUI.closedStatii;

            }

            PageParameters params = queryParameters(null, tm.name, states, null, null, true, 1);

            entryPanel.add(new LinkPanel("milestoneName", null, tm.name, TicketsPage.class, params).setRenderBodyOnly(true));



            String css;

@@ -576,7 +596,7 @@


               Fragment milestonePanel = new Fragment("milestonePanel", "openMilestoneFragment", this);

               Label label = new Label("progress");

               WicketUtils.setCssStyle(label, "width:" + tm.getProgress() + "%;");

               WicketUtils.setCssStyle(label, "width:" + m.getProgress() + "%;");

               milestonePanel.add(label);



               milestonePanel.add(new LinkPanel("openTickets", null,