From 97d3afed7f416bc3c0740b05974949ea38520c7e Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 28 Dec 2011 20:09:46 -0500 Subject: [PATCH] Manager support for hook script inheritance --- src/com/gitblit/client/RepositoriesPanel.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/gitblit/client/RepositoriesPanel.java b/src/com/gitblit/client/RepositoriesPanel.java index 2994b76..50284be 100644 --- a/src/com/gitblit/client/RepositoriesPanel.java +++ b/src/com/gitblit/client/RepositoriesPanel.java @@ -357,8 +357,8 @@ dialog.setTeams(gitblit.getTeamnames(), null); dialog.setRepositories(gitblit.getRepositories()); dialog.setFederationSets(gitblit.getFederationSets(), null); - dialog.setPreReceiveScripts(gitblit.getAvailableScripts(), null); - dialog.setPostReceiveScripts(gitblit.getAvailableScripts(), null); + dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(null), null); + dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(null), null); dialog.setVisible(true); final RepositoryModel newRepository = dialog.getRepository(); final List<String> permittedUsers = dialog.getPermittedUsers(); @@ -417,8 +417,10 @@ dialog.setTeams(gitblit.getTeamnames(), gitblit.getPermittedTeamnames(repository)); dialog.setRepositories(gitblit.getRepositories()); dialog.setFederationSets(gitblit.getFederationSets(), repository.federationSets); - dialog.setPreReceiveScripts(gitblit.getAvailableScripts(), repository.preReceiveScripts); - dialog.setPostReceiveScripts(gitblit.getAvailableScripts(), repository.postReceiveScripts); + dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(repository), + repository.preReceiveScripts); + dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(repository), + repository.postReceiveScripts); dialog.setVisible(true); final RepositoryModel revisedRepository = dialog.getRepository(); final List<String> permittedUsers = dialog.getPermittedUsers(); -- Gitblit v1.9.1