From 3dec957f01b1e6b0af31476361efbb5767d0303d Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 01 Nov 2012 09:13:16 -0400 Subject: [PATCH] Centralize Manager row height setting --- src/com/gitblit/client/GitblitClient.java | 47 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 42 insertions(+), 5 deletions(-) diff --git a/src/com/gitblit/client/GitblitClient.java b/src/com/gitblit/client/GitblitClient.java index 9815cbe..56078fc 100644 --- a/src/com/gitblit/client/GitblitClient.java +++ b/src/com/gitblit/client/GitblitClient.java @@ -28,6 +28,7 @@ import java.util.TreeSet; import com.gitblit.Constants; +import com.gitblit.Constants.AccessPermission; import com.gitblit.Constants.AccessRestrictionType; import com.gitblit.Constants.AuthorizationControl; import com.gitblit.GitBlitException.ForbiddenException; @@ -35,10 +36,10 @@ import com.gitblit.GitBlitException.UnauthorizedException; import com.gitblit.GitBlitException.UnknownRequestException; import com.gitblit.Keys; -import com.gitblit.models.RegistrantAccessPermission; import com.gitblit.models.FederationModel; import com.gitblit.models.FeedEntryModel; import com.gitblit.models.FeedModel; +import com.gitblit.models.RegistrantAccessPermission; import com.gitblit.models.RepositoryModel; import com.gitblit.models.ServerSettings; import com.gitblit.models.ServerStatus; @@ -338,6 +339,7 @@ List<UserModel> users = RpcUtils.getUsers(url, account, password); allUsers.clear(); allUsers.addAll(users); + Collections.sort(users); return allUsers; } @@ -345,6 +347,7 @@ List<TeamModel> teams = RpcUtils.getTeams(url, account, password); allTeams.clear(); allTeams.addAll(teams); + Collections.sort(teams); return allTeams; } @@ -473,6 +476,15 @@ public List<UserModel> getUsers() { return allUsers; } + + public UserModel getUser(String username) { + for (UserModel user : getUsers()) { + if (user.username.equalsIgnoreCase(username)) { + return user; + } + } + return null; + } public List<String> getUsernames() { List<String> usernames = new ArrayList<String>(); @@ -493,8 +505,16 @@ return usernames; } - public List<RegistrantAccessPermission> getUserAccessPermissions(RepositoryModel repository) throws IOException { - return RpcUtils.getRepositoryMemberPermissions(repository, url, account, password); + public List<RegistrantAccessPermission> getUserAccessPermissions(RepositoryModel repository) { + List<RegistrantAccessPermission> list = new ArrayList<RegistrantAccessPermission>(); + for (UserModel user : getUsers()) { + RegistrantAccessPermission ap = user.getRepositoryPermission(repository); + if (ap.permission.exceeds(AccessPermission.NONE)) { + list.add(ap); + } + } + Collections.sort(list); + return list; } public boolean setUserAccessPermissions(RepositoryModel repository, List<RegistrantAccessPermission> permissions) throws IOException { @@ -524,8 +544,16 @@ return teamnames; } - public List<RegistrantAccessPermission> getTeamAccessPermissions(RepositoryModel repository) throws IOException { - return RpcUtils.getRepositoryTeamPermissions(repository, url, account, password); + public List<RegistrantAccessPermission> getTeamAccessPermissions(RepositoryModel repository) { + List<RegistrantAccessPermission> list = new ArrayList<RegistrantAccessPermission>(); + for (TeamModel team : allTeams) { + RegistrantAccessPermission ap = team.getRepositoryPermission(repository); + if (ap.permission.exceeds(AccessPermission.NONE)) { + list.add(ap); + } + } + Collections.sort(list); + return list; } public boolean setTeamAccessPermissions(RepositoryModel repository, List<RegistrantAccessPermission> permissions) throws IOException { @@ -548,6 +576,15 @@ public List<RepositoryModel> getRepositories() { return allRepositories; } + + public RepositoryModel getRepository(String name) { + for (RepositoryModel repository : allRepositories) { + if (repository.name.equalsIgnoreCase(name)) { + return repository; + } + } + return null; + } public boolean createRepository(RepositoryModel repository, List<RegistrantAccessPermission> userPermissions) throws IOException { -- Gitblit v1.9.1