Merged #214 "Only set mutable user access permissions"

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)

src/main/java/com/gitblit/wicket/pages/EditUserPage.java

@@ -178,7 +178,9 @@ public class EditUserPage extends RootSubPage {
 
 				// 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();