From ddec289815d4bd0e77d07b965b05b6a639f2c80d Mon Sep 17 00:00:00 2001
From: Guillaume Sauthier <guillaume.sauthier@peergreen.com>
Date: Mon, 05 Nov 2012 12:13:32 -0500
Subject: [PATCH] Fixes and reuse Bootstrap CSS in HTML sendmail (pull request #52)
---
src/com/gitblit/wicket/pages/EditUserPage.java | 22 +---------------------
1 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/EditUserPage.java b/src/com/gitblit/wicket/pages/EditUserPage.java
index 05aee6d..80f09db 100644
--- a/src/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/com/gitblit/wicket/pages/EditUserPage.java
@@ -33,15 +33,12 @@
import org.apache.wicket.model.Model;
import org.apache.wicket.model.util.CollectionModel;
import org.apache.wicket.model.util.ListModel;
-import org.slf4j.LoggerFactory;
-import com.gitblit.Constants.PermissionType;
import com.gitblit.Constants.RegistrantType;
import com.gitblit.GitBlit;
import com.gitblit.GitBlitException;
import com.gitblit.Keys;
import com.gitblit.models.RegistrantAccessPermission;
-import com.gitblit.models.RepositoryModel;
import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
@@ -105,24 +102,7 @@
Collections.sort(userTeams);
final String oldName = userModel.username;
- final List<RegistrantAccessPermission> permissions = userModel.getRepositoryPermissions();
- for (RegistrantAccessPermission permission : permissions) {
- if (permission.isEditable && PermissionType.EXPLICIT.equals(permission.permissionType)) {
- // Ensure this is NOT an owner permission - which is non-editable
- // We don't know this from within the usermodel, ownership is a
- // property of a repository.
- RepositoryModel rm = GitBlit.self().getRepositoryModel(permission.registrant);
- if (rm == null) {
- LoggerFactory.getLogger(getClass()).error("Missing repository " + permission.registrant, new NullPointerException());
- continue;
- }
- boolean isOwner = rm.isOwner(oldName);
- if (isOwner) {
- permission.permissionType = PermissionType.OWNER;
- permission.isEditable = false;
- }
- }
- }
+ final List<RegistrantAccessPermission> permissions = GitBlit.self().getUserAccessPermissions(userModel);
final Palette<String> teams = new Palette<String>("teams", new ListModel<String>(
new ArrayList<String>(userTeams)), new CollectionModel<String>(GitBlit.self()
--
Gitblit v1.9.1