Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

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