Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/main/java/com/gitblit/tickets/TicketIndexer.java

@@ -103,7 +103,10 @@
      mergesha(Type.STRING),
      mergeto(Type.STRING),
      patchsets(Type.INT),
      votes(Type.INT);
      votes(Type.INT),
      //NOTE: Indexing on the underlying value to allow flexibility on naming
      priority(Type.INT),
      severity(Type.INT);

      final Type fieldType;

@@ -519,6 +522,8 @@
      toDocField(doc, Lucene.watchedby, StringUtils.flattenStrings(ticket.getWatchers(), ";").toLowerCase());
      toDocField(doc, Lucene.mentions, StringUtils.flattenStrings(ticket.getMentions(), ";").toLowerCase());
      toDocField(doc, Lucene.votes, ticket.getVoters().size());
      toDocField(doc, Lucene.priority, ticket.priority.getValue());
      toDocField(doc, Lucene.severity, ticket.severity.getValue());

      List<String> attachments = new ArrayList<String>();
      for (Attachment attachment : ticket.getAttachments()) {
@@ -600,6 +605,8 @@
      result.participants = unpackStrings(doc, Lucene.participants);
      result.watchedby = unpackStrings(doc, Lucene.watchedby);
      result.mentions = unpackStrings(doc, Lucene.mentions);
      result.priority = TicketModel.Priority.fromObject(unpackInt(doc, Lucene.priority), TicketModel.Priority.defaultPriority);
      result.severity = TicketModel.Severity.fromObject(unpackInt(doc, Lucene.severity), TicketModel.Severity.defaultSeverity);

      if (!StringUtils.isEmpty(doc.get(Lucene.patchset.name()))) {
         // unpack most recent patchset