Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

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

@@ -76,6 +76,10 @@


   private Label descriptionPreview;



   private IModel<TicketModel.Priority> priorityModel;



   private IModel<TicketModel.Severity> severityModel;



   public NewTicketPage(PageParameters params) {

      super(params);



@@ -95,6 +99,8 @@
      mergeToModel = Model.of(Repository.shortenRefName(getRepositoryModel().mergeTo));

      responsibleModel = Model.of();

      milestoneModel = Model.of();

      severityModel = Model.of(TicketModel.Severity.defaultSeverity);

      priorityModel = Model.of(TicketModel.Priority.defaultPriority);



      setStatelessHint(false);

      setOutputMarkupId(true);

@@ -105,6 +111,7 @@
      form.add(new DropDownChoice<TicketModel.Type>("type", typeModel, Arrays.asList(TicketModel.Type.choices())));

      form.add(new TextField<String>("title", titleModel));

      form.add(new TextField<String>("topic", topicModel));

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



      final IModel<String> markdownPreviewModel = Model.of();

      descriptionPreview = new Label("descriptionPreview", markdownPreviewModel);

@@ -152,6 +159,11 @@
         milestone.add(new DropDownChoice<TicketMilestone>("milestone", milestoneModel, milestones));

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



         // priority

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

         priority.add(new DropDownChoice<TicketModel.Priority>("priority", priorityModel, Arrays.asList(TicketModel.Priority.choices())));

         form.add(priority);



         // integration branch

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

         for (String branch : getRepositoryModel().getLocalBranches()) {

@@ -171,6 +183,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("create") {

@@ -212,6 +225,20 @@
               change.setField(Field.milestone, milestone.name);

            }



            // severity

            TicketModel.Severity severity = TicketModel.Severity.defaultSeverity;

            if (severityModel.getObject() != null) {

               severity = severityModel.getObject();

            }

            change.setField(Field.severity, severity);



            // priority

            TicketModel.Priority priority = TicketModel.Priority.defaultPriority;

            if (priorityModel.getObject() != null) {

               priority = priorityModel.getObject();

            }

            change.setField(Field.priority, priority);



            // integration branch

            String mergeTo = mergeToModel.getObject();

            if (!StringUtils.isEmpty(mergeTo)) {