Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

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

@@ -19,6 +19,8 @@
import java.util.Arrays;

import java.util.Collections;

import java.util.List;

import java.util.Set;

import java.util.TreeSet;



import org.apache.wicket.PageParameters;

import org.apache.wicket.ajax.AjaxRequestTarget;

@@ -35,6 +37,7 @@


import com.gitblit.Constants;

import com.gitblit.Constants.AccessPermission;

import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.TicketModel;

import com.gitblit.models.TicketModel.Change;

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


   private Label descriptionPreview;



   private IModel<TicketModel.Priority> priorityModel;



   private IModel<TicketModel.Severity> severityModel;



   public NewTicketPage(PageParameters params) {

      super(params);



@@ -92,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);

@@ -102,8 +111,9 @@
      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 = new Model<String>();

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

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

      descriptionPreview.setEscapeModelStrings(false);

      descriptionPreview.setOutputMarkupId(true);

@@ -115,13 +125,27 @@


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

         // responsible

         List<TicketResponsible> responsibles = new ArrayList<TicketResponsible>();

         for (RegistrantAccessPermission rp : app().repositories().getUserAccessPermissions(getRepositoryModel())) {

            if (rp.permission.atLeast(AccessPermission.PUSH) && !rp.isTeam()) {

               UserModel user = app().users().getUserModel(rp.registrant);

               if (user != null) {

                  responsibles.add(new TicketResponsible(user));

         Set<String> userlist = new TreeSet<String>();



         if (UserModel.ANONYMOUS.canPush(getRepositoryModel())

               || AuthorizationControl.AUTHENTICATED == getRepositoryModel().authorizationControl) {

            //    authorization is ANONYMOUS or AUTHENTICATED (i.e. all users can be set responsible)

            userlist.addAll(app().users().getAllUsernames());

         } else {

            // authorization is by NAMED users (users with PUSH permission can be set responsible)

            for (RegistrantAccessPermission rp : app().repositories().getUserAccessPermissions(getRepositoryModel())) {

               if (rp.permission.atLeast(AccessPermission.PUSH)) {

                  userlist.add(rp.registrant);

               }

            }

         }



         List<TicketResponsible> responsibles = new ArrayList<TicketResponsible>();

         for (String username : userlist) {

            UserModel user = app().users().getUserModel(username);

            if (user != null && !user.disabled) {

               TicketResponsible responsible = new TicketResponsible(user);

               responsibles.add(responsible);

            }

         }

         Collections.sort(responsibles);

@@ -134,6 +158,11 @@
         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);

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

         form.add(priority);



         // integration branch

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

@@ -154,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") {

@@ -195,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)) {

@@ -205,7 +249,8 @@
            if (ticket != null) {

               TicketNotifier notifier = app().tickets().createNotifier();

               notifier.sendMailing(ticket);

               setResponsePage(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));



               redirectTo(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));

            } else {

               // TODO error

            }