James Moger
2014-05-12 a3dd0d0416fe093852293bcedb83c9b1e6fe06cb
Merge branch 'ticket/71' into develop
2 files modified
32 ■■■■ changed files
src/main/java/com/gitblit/wicket/pages/EditTicketPage.java 14 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/NewTicketPage.java 18 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
@@ -163,16 +163,22 @@
            // responsible
            Set<String> userlist = new TreeSet<String>(ticket.getParticipants());
            for (RegistrantAccessPermission rp : app().repositories().getUserAccessPermissions(getRepositoryModel())) {
                if (rp.permission.atLeast(AccessPermission.PUSH) && !rp.isTeam()) {
                    userlist.add(rp.registrant);
            if (UserModel.ANONYMOUS.canPush(getRepositoryModel())) {
                // anonymous push
                userlist.addAll(app().users().getAllUsernames());
            } else {
                // authenticated push
                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>();
            for (String username : userlist) {
                UserModel user = app().users().getUserModel(username);
                if (user != null) {
                if (user != null && !user.disabled) {
                    TicketResponsible responsible = new TicketResponsible(user);
                    responsibles.add(responsible);
                    if (user.username.equals(ticket.responsible)) {
src/main/java/com/gitblit/wicket/pages/NewTicketPage.java
@@ -116,13 +116,23 @@
        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) {
            if (UserModel.ANONYMOUS.canPush(getRepositoryModel())) {
                // anonymous push allowed
                for (UserModel user : app().users().getAllUsers()) {
                    if (!user.disabled) {
                        responsibles.add(new TicketResponsible(user));
                    }
                }
            } else {
                // authenticated push
                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 && !user.disabled) {
                            responsibles.add(new TicketResponsible(user));
                        }
                    }
                }
            }
            Collections.sort(responsibles);
            Fragment responsible = new Fragment("responsible", "responsibleFragment", this);