From 0256e6aa26ebb51416d290d772897caf84a1cd82 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 13 Jan 2012 08:16:40 -0500
Subject: [PATCH] Merge branch 'master' into issues
---
src/com/gitblit/client/TeamsPanel.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/com/gitblit/client/TeamsPanel.java b/src/com/gitblit/client/TeamsPanel.java
index 2d1d914..7182566 100644
--- a/src/com/gitblit/client/TeamsPanel.java
+++ b/src/com/gitblit/client/TeamsPanel.java
@@ -257,6 +257,10 @@
dialog.setTeams(gitblit.getTeams());
dialog.setRepositories(gitblit.getRepositories(), null);
dialog.setUsers(gitblit.getUsernames(), 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) {
@@ -304,6 +308,10 @@
dialog.setRepositories(gitblit.getRepositories(), new ArrayList<String>(team.repositories));
dialog.setUsers(gitblit.getUsernames(), team.users == null ? null : new ArrayList<String>(
team.users));
+ dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(null),
+ gitblit.getPreReceiveScriptsInherited(null), team.preReceiveScripts);
+ dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(null),
+ gitblit.getPostReceiveScriptsInherited(null), team.postReceiveScripts);
dialog.setVisible(true);
final TeamModel revisedTeam = dialog.getTeam();
if (revisedTeam == null) {
--
Gitblit v1.9.1