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/TeamsPanel.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/client/TeamsPanel.java b/src/com/gitblit/client/TeamsPanel.java
index b2a1873..9218222 100644
--- a/src/com/gitblit/client/TeamsPanel.java
+++ b/src/com/gitblit/client/TeamsPanel.java
@@ -109,7 +109,6 @@
defaultSorter = new TableRowSorter<TeamsTableModel>(tableModel);
table = Utils.newTable(tableModel, Utils.DATE_FORMAT);
String name = table.getColumnName(TeamsTableModel.Columns.Name.ordinal());
- table.setRowHeight(nameRenderer.getFont().getSize() + 8);
table.getColumn(name).setCellRenderer(nameRenderer);
int w = 125;
@@ -257,8 +256,10 @@
dialog.setTeams(gitblit.getTeams());
dialog.setRepositories(gitblit.getRepositories(), null);
dialog.setUsers(gitblit.getUsernames(), null);
- dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(null), null);
- dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(null), null);
+ dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(null),
+ gitblit.getPreReceiveScriptsInherited(null), null);
+ dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(null),
+ gitblit.getPostReceiveScriptsInherited(null), null);
dialog.setVisible(true);
final TeamModel newTeam = dialog.getTeam();
if (newTeam == null) {
@@ -303,13 +304,13 @@
gitblit.getSettings());
dialog.setLocationRelativeTo(TeamsPanel.this);
dialog.setTeams(gitblit.getTeams());
- dialog.setRepositories(gitblit.getRepositories(), new ArrayList<String>(team.repositories));
+ dialog.setRepositories(gitblit.getRepositories(), team.getRepositoryPermissions());
dialog.setUsers(gitblit.getUsernames(), team.users == null ? null : new ArrayList<String>(
team.users));
dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(null),
- team.preReceiveScripts);
+ gitblit.getPreReceiveScriptsInherited(null), team.preReceiveScripts);
dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(null),
- team.postReceiveScripts);
+ gitblit.getPostReceiveScriptsInherited(null), team.postReceiveScripts);
dialog.setVisible(true);
final TeamModel revisedTeam = dialog.getTeam();
if (revisedTeam == null) {
--
Gitblit v1.9.1