From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/client/UsersPanel.java | 32 +++-----------------------------
1 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/src/com/gitblit/client/UsersPanel.java b/src/com/gitblit/client/UsersPanel.java
index 2c1481a..c53a579 100644
--- a/src/com/gitblit/client/UsersPanel.java
+++ b/src/com/gitblit/client/UsersPanel.java
@@ -25,7 +25,6 @@
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.io.IOException;
-import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -41,10 +40,7 @@
import javax.swing.event.ListSelectionListener;
import javax.swing.table.TableRowSorter;
-import com.gitblit.Constants.PermissionType;
import com.gitblit.Constants.RpcRequest;
-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;
@@ -114,11 +110,10 @@
defaultSorter = new TableRowSorter<UsersTableModel>(tableModel);
table = Utils.newTable(tableModel, Utils.DATE_FORMAT);
String name = table.getColumnName(UsersTableModel.Columns.Name.ordinal());
- table.setRowHeight(nameRenderer.getFont().getSize() + 8);
table.getColumn(name).setCellRenderer(nameRenderer);
- int w = 125;
- name = table.getColumnName(UsersTableModel.Columns.AccessLevel.ordinal());
+ int w = 130;
+ name = table.getColumnName(UsersTableModel.Columns.Type.ordinal());
table.getColumn(name).setMinWidth(w);
table.getColumn(name).setMaxWidth(w);
name = table.getColumnName(UsersTableModel.Columns.Teams.ordinal());
@@ -313,28 +308,7 @@
gitblit.getSettings());
dialog.setLocationRelativeTo(UsersPanel.this);
dialog.setUsers(gitblit.getUsers());
-
- List<RegistrantAccessPermission> permissions = user.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.getRepository(permission.registrant);
- if (rm == null) {
- System.out.println(MessageFormat.format("{0}: failed to find registrant repository {1}",
- getClass().getSimpleName(), permission.registrant));
- continue;
- }
- boolean isOwner = rm.isOwner(user.username);
- if (isOwner) {
- permission.permissionType = PermissionType.OWNER;
- permission.isEditable = false;
- }
- }
- }
-
- dialog.setRepositories(gitblit.getRepositories(), user.getRepositoryPermissions());
+ dialog.setRepositories(gitblit.getRepositories(), gitblit.getUserAccessPermissions(user));
dialog.setTeams(gitblit.getTeams(), user.teams == null ? null : new ArrayList<TeamModel>(
user.teams));
dialog.setVisible(true);
--
Gitblit v1.9.1