From f2dff4ea2ba10dca13b54d5968c5021f071b3ddd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 28 Dec 2011 20:40:31 -0500
Subject: [PATCH] Show inherited push scripts in Manager
---
src/com/gitblit/client/TeamsPanel.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/client/TeamsPanel.java b/src/com/gitblit/client/TeamsPanel.java
index b2a1873..7182566 100644
--- a/src/com/gitblit/client/TeamsPanel.java
+++ b/src/com/gitblit/client/TeamsPanel.java
@@ -257,8 +257,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) {
@@ -307,9 +309,9 @@
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