From 332e93c9e8b2ef756ac2b2ec1055262046f988fa Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 30 Mar 2012 20:01:03 -0400 Subject: [PATCH] Merge pull request #10 from jonnybbb/master --- src/com/gitblit/wicket/pages/FederationRegistrationPage.java | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/com/gitblit/wicket/pages/FederationRegistrationPage.java b/src/com/gitblit/wicket/pages/FederationRegistrationPage.java index aed94a4..751dac8 100644 --- a/src/com/gitblit/wicket/pages/FederationRegistrationPage.java +++ b/src/com/gitblit/wicket/pages/FederationRegistrationPage.java @@ -25,24 +25,15 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider; import com.gitblit.GitBlit; -import com.gitblit.Keys; import com.gitblit.models.FederationModel; import com.gitblit.models.FederationModel.RepositoryStatus; -import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; -public class FederationRegistrationPage extends StandardPage { +public class FederationRegistrationPage extends RootSubPage { public FederationRegistrationPage(PageParameters params) { super(params); - - final boolean showAdmin; - if (GitBlit.getBoolean(Keys.web.authenticateAdminPages, true)) { - boolean allowAdmin = GitBlit.getBoolean(Keys.web.allowAdministration, false); - showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin(); - } else { - showAdmin = false; - } + setStatelessHint(true); String url = WicketUtils.getUrlParameter(params); @@ -50,7 +41,7 @@ FederationModel registration = GitBlit.self().getFederationRegistration(url, name); if (registration == null) { - error("Could not find federation registration!", true); + error(getString("gb.couldNotFindFederationRegistration"), true); } setupPage(registration.isResultData() ? getString("gb.federationResults") -- Gitblit v1.9.1