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/panels/FederationProposalsPanel.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/gitblit/wicket/panels/FederationProposalsPanel.java b/src/com/gitblit/wicket/panels/FederationProposalsPanel.java index f83f926..3e70cce 100644 --- a/src/com/gitblit/wicket/panels/FederationProposalsPanel.java +++ b/src/com/gitblit/wicket/panels/FederationProposalsPanel.java @@ -28,7 +28,7 @@ import com.gitblit.GitBlit; import com.gitblit.models.FederationProposal; import com.gitblit.wicket.WicketUtils; -import com.gitblit.wicket.pages.FederationProposalPage; +import com.gitblit.wicket.pages.ReviewProposalPage; public class FederationProposalsPanel extends BasePanel { @@ -54,11 +54,11 @@ public void populateItem(final Item<FederationProposal> item) { final FederationProposal entry = item.getModelObject(); - item.add(new LinkPanel("url", "list", entry.url, FederationProposalPage.class, + item.add(new LinkPanel("url", "list", entry.url, ReviewProposalPage.class, WicketUtils.newTokenParameter(entry.token))); - item.add(WicketUtils.createDateLabel("received", entry.received, getTimeZone())); + item.add(WicketUtils.createDateLabel("received", entry.received, getTimeZone(), getTimeUtils())); item.add(new Label("tokenType", entry.tokenType.name())); - item.add(new LinkPanel("token", "list", entry.token, FederationProposalPage.class, + item.add(new LinkPanel("token", "list", entry.token, ReviewProposalPage.class, WicketUtils.newTokenParameter(entry.token))); Link<Void> deleteLink = new Link<Void>("deleteProposal") { -- Gitblit v1.9.1