Browse Source

Merge branch 'ticket/71' into develop

tags/v1.6.0
James Moger 10 years ago
parent
commit
a3dd0d0416

+ 10
- 4
src/main/java/com/gitblit/wicket/pages/EditTicketPage.java View File

@@ -163,16 +163,22 @@ public class EditTicketPage extends RepositoryPage {
// 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)) {

+ 14
- 4
src/main/java/com/gitblit/wicket/pages/NewTicketPage.java View File

@@ -116,13 +116,23 @@ public class NewTicketPage extends RepositoryPage {
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);

Loading…
Cancel
Save