From 4fea450fd3edfba6bb9e2c3c0a9231c6d227a09c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 23 Feb 2012 19:49:46 -0500 Subject: [PATCH] Fixed nullpointer on pushing to an empty repository (issue 69) --- src/com/gitblit/wicket/panels/FederationProposalsPanel.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/wicket/panels/FederationProposalsPanel.java b/src/com/gitblit/wicket/panels/FederationProposalsPanel.java index f83f926..11f3f5c 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(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