From d7905a15bf41df0574bd8613bf16f2d7ef0cb805 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 27 Dec 2011 17:50:39 -0500 Subject: [PATCH] Implemented Team hook scripts --- src/com/gitblit/wicket/pages/EditRepositoryPage.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java index 69d2119..0f3a0bb 100644 --- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java +++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java @@ -121,8 +121,8 @@ } final Palette<String> preReceivePalette = new Palette<String>("preReceiveScripts", new ListModel<String>(preReceiveScripts), new CollectionModel<String>(GitBlit - .self().getAvailableScripts()), new ChoiceRenderer<String>("", ""), 12, - true); + .self().getPreReceiveScriptsUnused(repositoryModel)), + new ChoiceRenderer<String>("", ""), 12, true); // post-receive palette if (repositoryModel.postReceiveScripts != null) { @@ -130,8 +130,8 @@ } final Palette<String> postReceivePalette = new Palette<String>("postReceiveScripts", new ListModel<String>(postReceiveScripts), new CollectionModel<String>(GitBlit - .self().getAvailableScripts()), new ChoiceRenderer<String>("", ""), 12, - true); + .self().getPostReceiveScriptsUnused(repositoryModel)), + new ChoiceRenderer<String>("", ""), 12, true); CompoundPropertyModel<RepositoryModel> model = new CompoundPropertyModel<RepositoryModel>( repositoryModel); @@ -293,9 +293,11 @@ form.add(teamsPalette); form.add(federationSetsPalette); form.add(preReceivePalette); - form.add(new BulletListPanel("inheritedPreReceive", "inherited", GitBlit.self().getInheritedPreReceiveScripts(repositoryModel))); + form.add(new BulletListPanel("inheritedPreReceive", "inherited", GitBlit.self() + .getPreReceiveScriptsInherited(repositoryModel))); form.add(postReceivePalette); - form.add(new BulletListPanel("inheritedPostReceive", "inherited", GitBlit.self().getInheritedPostReceiveScripts(repositoryModel))); + form.add(new BulletListPanel("inheritedPostReceive", "inherited", GitBlit.self() + .getPostReceiveScriptsInherited(repositoryModel))); form.add(new Button("save")); Button cancel = new Button("cancel") { -- Gitblit v1.9.1