Merged #173 "Fix MigrateTickets failure for view-restricted repositories"

James Moger

2014-09-08 0601663aec4ffd24e24abc97cf360529de5c716c

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

@@ -37,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;

@@ -49,6 +50,8 @@
import com.gitblit.tickets.TicketResponsible;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.SafeTextModel;

import com.gitblit.wicket.SafeTextModel.Mode;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.MarkdownTextArea;



@@ -109,8 +112,8 @@
      }



      typeModel = Model.of(ticket.type);

      titleModel = Model.of(ticket.title);

      topicModel = Model.of(ticket.topic == null ? "" : ticket.topic);

      titleModel = SafeTextModel.none(ticket.title);

      topicModel = SafeTextModel.none(ticket.topic == null ? "" : ticket.topic);

      responsibleModel = Model.of();

      milestoneModel = Model.of();

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

@@ -133,7 +136,7 @@
      form.add(new TextField<String>("title", titleModel));

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



      final IModel<String> markdownPreviewModel = new Model<String>();

      final SafeTextModel markdownPreviewModel = new SafeTextModel(Mode.none);

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

      descriptionPreview.setEscapeModelStrings(false);

      descriptionPreview.setOutputMarkupId(true);

@@ -163,13 +166,14 @@
         // responsible

         Set<String> userlist = new TreeSet<String>(ticket.getParticipants());



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

            // anonymous push

         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 {

            // authenticated push

            // 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) && !rp.isTeam()) {

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

                  userlist.add(rp.registrant);

               }

            }