Only set mutable user access permissions

diff --git a/releases.moxie b/releases.moxie
index 41259a7d70dda6b551665095d00aed35731b3c39..2bca1a7442b653fc1ac3e9382d27f85f6a9f5f56 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -17,6 +17,7 @@ r27: {
     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 5ee2f9fd79b7076ae80e06c18842c8c3382d6d48..c6b5c3c74d0e055d3bbb5b7f3e0dacdd5c6095bd 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
@@ -178,7 +178,9 @@ public class EditUserPage extends RootSubPage {
 \r
                                // update user permissions\r
                                for (RegistrantAccessPermission repositoryPermission : permissions) {\r
-                                       userModel.setRepositoryPermission(repositoryPermission.registrant, repositoryPermission.permission);\r
+                                       if (repositoryPermission.mutable) {\r
+                                               userModel.setRepositoryPermission(repositoryPermission.registrant, repositoryPermission.permission);\r
+                                       }\r
                                }\r
 \r
                                Iterator<String> selectedTeams = teams.getSelectedChoices();\r