From 8a036644cc97e9efcd11839e5f2e5f1cc5822e24 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 31 Oct 2014 10:06:17 -0400
Subject: [PATCH] Merged #214 "Only set mutable user access permissions"
---
src/main/java/com/gitblit/wicket/pages/EditUserPage.java | 4 +++-
releases.moxie | 1 +
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/releases.moxie b/releases.moxie
index 41259a7..2bca1a7 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -17,6 +17,7 @@
fixes:
- Fix exception when viewing a ticket with a patchset where the integration branch does not exist (issue-521, ticket-212)
- Fix exception when deleting a repository using the FileTicketService (issue-522, ticket-213)
+ - Do not inject team repository permissions as explicit user permissoins when editing a user (issue-462, ticket-214)
changes:
- Replaced Dagger with Guice (ticket-80)
- Use release name as root directory in Gitblit GO artifacts (ticket-109)
diff --git a/src/main/java/com/gitblit/wicket/pages/EditUserPage.java b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
index 5ee2f9f..c6b5c3c 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
@@ -178,7 +178,9 @@
// update user permissions
for (RegistrantAccessPermission repositoryPermission : permissions) {
- userModel.setRepositoryPermission(repositoryPermission.registrant, repositoryPermission.permission);
+ if (repositoryPermission.mutable) {
+ userModel.setRepositoryPermission(repositoryPermission.registrant, repositoryPermission.permission);
+ }
}
Iterator<String> selectedTeams = teams.getSelectedChoices();
--
Gitblit v1.9.1