Merge branch 'ticket/91' into develop

James Moger

2014-05-29 38ba369972fe7e01a8ef6a950fd9bd403ef97eb6

Merge branch 'ticket/91' into develop

 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;

@@ -163,11 +164,12 @@
            // 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()) {

                        userlist.add(rp.registrant);


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

@@ -57,6 +57,7 @@


import com.gitblit.Constants;

import com.gitblit.Constants.AccessPermission;

import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.Keys;

import com.gitblit.git.PatchsetCommand;

import com.gitblit.git.PatchsetReceivePack;

@@ -383,11 +384,18 @@
                 * RESPONSIBLE LIST

                 */

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

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

                        userlist.add(rp.registrant);

                    }

                }

                }

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

                if (!StringUtils.isEmpty(ticket.responsible)) {

                    // exclude the current responsible