From d1231c63669f4bc3643985b9032de7f998612e08 Mon Sep 17 00:00:00 2001
From: Jason Pyeron <jpyeron@pdinc.us>
Date: Sun, 19 Aug 2012 21:35:52 -0400
Subject: [PATCH] fixed build to allow builds where a proxy is needed for access to outside resources see: http://ant.apache.org/manual/proxy.html
---
src/com/gitblit/wicket/pages/FederationRegistrationPage.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/FederationRegistrationPage.java b/src/com/gitblit/wicket/pages/FederationRegistrationPage.java
index aed94a4..19c30a5 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")
@@ -61,8 +52,8 @@
add(new Label("frequency", registration.frequency));
add(new Label("folder", registration.folder));
add(new Label("token", showAdmin ? registration.token : "--"));
- add(WicketUtils.createTimestampLabel("lastPull", registration.lastPull, getTimeZone()));
- add(WicketUtils.createTimestampLabel("nextPull", registration.nextPull, getTimeZone()));
+ add(WicketUtils.createTimestampLabel("lastPull", registration.lastPull, getTimeZone(), getTimeUtils()));
+ add(WicketUtils.createTimestampLabel("nextPull", registration.nextPull, getTimeZone(), getTimeUtils()));
StringBuilder inclusions = new StringBuilder();
for (String inc : registration.inclusions) {
--
Gitblit v1.9.1