Delegate closed ticket changes to the Edit Ticket page

James Moger

2014-03-05 85775acd760c668a73f9febf80009832ddf91af9

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

@@ -72,6 +72,8 @@


   private IModel<String> mergeToModel;



   private IModel<Status> statusModel;



   private IModel<TicketResponsible> responsibleModel;



   private IModel<TicketMilestone> milestoneModel;

@@ -110,6 +112,7 @@
      responsibleModel = Model.of();

      milestoneModel = Model.of();

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

      statusModel = Model.of(ticket.status);



      setStatelessHint(false);

      setOutputMarkupId(true);

@@ -143,6 +146,12 @@
            if (!ticket.body.equals(description)) {

               // description change

               change.setField(Field.body, description);

            }



            Status status = statusModel.getObject();

            if (!ticket.status.equals(status)) {

               // status change

               change.setField(Field.status, status);

            }



            Type type = typeModel.getObject();

@@ -213,6 +222,19 @@
         typeChoices = Arrays.asList(TicketModel.Type.choices());

      }

      form.add(new DropDownChoice<TicketModel.Type>("type", typeModel, typeChoices));



      List<Status> statusChoices;

      if (ticket.isClosed()) {

         statusChoices = Arrays.asList(ticket.status, Status.Open);

      } else if (ticket.isProposal()) {

         statusChoices = Arrays.asList(TicketModel.Status.proposalWorkflow);

      } else if (ticket.isBug()) {

         statusChoices = Arrays.asList(TicketModel.Status.bugWorkflow);

      } else {

         statusChoices = Arrays.asList(TicketModel.Status.requestWorkflow);

      }

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



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

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



@@ -262,6 +284,13 @@
               break;

            }

         }

         if (milestoneModel.getObject() == null && !StringUtils.isEmpty(ticket.milestone)) {

            // ensure that this unrecognized milestone is listed

            // so that we get the <nil> selection.

            TicketMilestone tms = new TicketMilestone(ticket.milestone);

            milestones.add(tms);

            milestoneModel.setObject(tms);

         }

         if (!milestones.isEmpty()) {

            milestones.add(new TicketMilestone(NIL));

         }