Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

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

@@ -84,6 +84,10 @@


   private Label descriptionPreview;



   private IModel<TicketModel.Priority> priorityModel;



   private IModel<TicketModel.Severity> severityModel;



   public EditTicketPage(PageParameters params) {

      super(params);



@@ -117,6 +121,8 @@
      milestoneModel = Model.of();

      mergeToModel = Model.of(ticket.mergeTo == null ? getRepositoryModel().mergeTo : ticket.mergeTo);

      statusModel = Model.of(ticket.status);

      priorityModel = Model.of(ticket.priority);

      severityModel = Model.of(ticket.severity);



      setStatelessHint(false);

      setOutputMarkupId(true);

@@ -160,6 +166,9 @@
      Fragment status = new Fragment("status", "statusFragment", this);

      status.add(new DropDownChoice<TicketModel.Status>("status", statusModel, statusChoices));

      form.add(status);



      List<TicketModel.Severity> severityChoices = Arrays.asList(TicketModel.Severity.choices());

      form.add(new DropDownChoice<TicketModel.Severity>("severity", severityModel, severityChoices));



      if (currentUser.canAdmin(ticket, getRepositoryModel())) {

         // responsible

@@ -214,10 +223,16 @@
            milestones.add(new TicketMilestone(NIL));

         }



         // milestone

         Fragment milestone = new Fragment("milestone", "milestoneFragment", this);



         milestone.add(new DropDownChoice<TicketMilestone>("milestone", milestoneModel, milestones));

         form.add(milestone.setVisible(!milestones.isEmpty()));



         // priority

         Fragment priority = new Fragment("priority", "priorityFragment", this);

         List<TicketModel.Priority> priorityChoices = Arrays.asList(TicketModel.Priority.choices());

         priority.add(new DropDownChoice<TicketModel.Priority>("priority", priorityModel, priorityChoices));

         form.add(priority);



         // mergeTo (integration branch)

         List<String> branches = new ArrayList<String>();

@@ -238,6 +253,7 @@
         form.add(new Label("responsible").setVisible(false));

         form.add(new Label("milestone").setVisible(false));

         form.add(new Label("mergeto").setVisible(false));

         form.add(new Label("priority").setVisible(false));

      }



      form.add(new AjaxButton("update") {

@@ -316,6 +332,18 @@
               }

            }



            TicketModel.Priority priority = priorityModel.getObject();

            if (!ticket.priority.equals(priority))

            {

               change.setField(Field.priority, priority);

            }



            TicketModel.Severity severity = severityModel.getObject();

            if (!ticket.severity.equals(severity))

            {

               change.setField(Field.severity, severity);

            }



            String mergeTo = mergeToModel.getObject();

            if ((StringUtils.isEmpty(ticket.mergeTo) && !StringUtils.isEmpty(mergeTo))

                  || (!StringUtils.isEmpty(mergeTo) && !mergeTo.equals(ticket.mergeTo))) {