From 87163b405e60dba58453105cd8c06181d4f6b13a Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 05 Mar 2015 09:17:34 -0500 Subject: [PATCH] Merged #243 "Allow Forks is not saved on repository edit" --- src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.java | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.java b/src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.java index 19c30a5..c26c975 100644 --- a/src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.java +++ b/src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.java @@ -24,7 +24,6 @@ import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; -import com.gitblit.GitBlit; import com.gitblit.models.FederationModel; import com.gitblit.models.FederationModel.RepositoryStatus; import com.gitblit.wicket.WicketUtils; @@ -33,13 +32,13 @@ public FederationRegistrationPage(PageParameters params) { super(params); - + setStatelessHint(true); String url = WicketUtils.getUrlParameter(params); String name = WicketUtils.getNameParameter(params); - FederationModel registration = GitBlit.self().getFederationRegistration(url, name); + FederationModel registration = app().federation().getFederationRegistration(url, name); if (registration == null) { error(getString("gb.couldNotFindFederationRegistration"), true); } @@ -81,6 +80,7 @@ counter = 0; } + @Override public void populateItem(final Item<RepositoryStatus> item) { final RepositoryStatus entry = item.getModelObject(); item.add(WicketUtils.getPullStatusImage("statusIcon", entry.status)); @@ -92,4 +92,9 @@ }; add(dataView); } + + @Override + protected Class<? extends BasePage> getRootNavPageClass() { + return FederationPage.class; + } } -- Gitblit v1.9.1