summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-05-29 10:47:12 -0400
committerJames Moger <james.moger@gitblit.com>2014-05-29 10:47:12 -0400
commite6ba88ec330241395b10d2e487b33b77672857a3 (patch)
treec6929aa785a0dbd7b0fb117013199716e4bc536f /src
parent38ba369972fe7e01a8ef6a950fd9bd403ef97eb6 (diff)
parent80546886e3d3a1a8904654738e3f8e0e821b460e (diff)
downloadgitblit-e6ba88ec330241395b10d2e487b33b77672857a3.tar.gz
gitblit-e6ba88ec330241395b10d2e487b33b77672857a3.zip
Merge branch 'ticket/87' into develop
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/gitblit/wicket/pages/EditTicketPage.java2
-rw-r--r--src/main/java/com/gitblit/wicket/pages/TicketPage.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
index fd5fc607..4a06e59e 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
@@ -171,7 +171,7 @@ public class EditTicketPage extends RepositoryPage {
} 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()) {
+ if (rp.permission.atLeast(AccessPermission.PUSH)) {
userlist.add(rp.registrant);
}
}
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index 10a7cc41..f7e4ada5 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -391,7 +391,7 @@ public class TicketPage extends RepositoryPage {
} 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()) {
+ if (rp.permission.atLeast(AccessPermission.PUSH)) {
userlist.add(rp.registrant);
}
}