From ce3f4bd24c330e0cace6a31567e1516dfaa66234 Mon Sep 17 00:00:00 2001 From: Christian Aistleitner <christian@quelltextlich.at> Date: Sun, 24 Mar 2013 20:42:23 -0400 Subject: [PATCH] Fix NPE when getting user's fork without repository list caching (issue-182) --- src/com/gitblit/client/UsersPanel.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/gitblit/client/UsersPanel.java b/src/com/gitblit/client/UsersPanel.java index 0dfa043..c53a579 100644 --- a/src/com/gitblit/client/UsersPanel.java +++ b/src/com/gitblit/client/UsersPanel.java @@ -110,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()); @@ -309,7 +308,7 @@ gitblit.getSettings()); dialog.setLocationRelativeTo(UsersPanel.this); dialog.setUsers(gitblit.getUsers()); - dialog.setRepositories(gitblit.getRepositories(), new ArrayList<String>(user.repositories)); + 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