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 | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/com/gitblit/client/UsersPanel.java b/src/com/gitblit/client/UsersPanel.java index 469d953..c53a579 100644 --- a/src/com/gitblit/client/UsersPanel.java +++ b/src/com/gitblit/client/UsersPanel.java @@ -40,11 +40,7 @@ import javax.swing.event.ListSelectionListener; import javax.swing.table.TableRowSorter; -import com.gitblit.Constants.AccessPermission; -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,7 +308,7 @@ gitblit.getSettings()); dialog.setLocationRelativeTo(UsersPanel.this); dialog.setUsers(gitblit.getUsers()); - 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