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/ReviewProposalPage.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/com/gitblit/wicket/pages/ReviewProposalPage.java b/src/com/gitblit/wicket/pages/ReviewProposalPage.java
index b006d80..25ceb65 100644
--- a/src/com/gitblit/wicket/pages/ReviewProposalPage.java
+++ b/src/com/gitblit/wicket/pages/ReviewProposalPage.java
@@ -33,7 +33,7 @@
 import com.gitblit.wicket.panels.RepositoriesPanel;
 
 @RequiresAdminRole
-public class ReviewProposalPage extends BasePage {
+public class ReviewProposalPage extends RootSubPage {
 
 	private final String PROPS_PATTERN = "{0} = {1}\n";
 
@@ -42,23 +42,22 @@
 	public ReviewProposalPage(PageParameters params) {
 		super(params);
 
-		setupPage("", getString("gb.proposals"));
-		setStatelessHint(true);
-
 		final String token = WicketUtils.getToken(params);
 
 		FederationProposal proposal = GitBlit.self().getPendingFederationProposal(token);
 		if (proposal == null) {
-			error("Could not find federation proposal!", true);
+			error(getString("gb.couldNotFindFederationProposal"), true);
 		}
+
+		setupPage(getString("gb.proposals"), proposal.url);
+		
 
 		add(new Label("url", proposal.url));
 		add(new Label("message", proposal.message));
 		add(WicketUtils.createTimestampLabel("received", proposal.received, getTimeZone()));
 		add(new Label("token", proposal.token));
 		add(new Label("tokenType", proposal.tokenType.name()));
-
-		boolean go = true;
+		
 		String p;
 		if (GitBlit.isGO()) {
 			// gitblit.properties definition
@@ -92,8 +91,8 @@
 
 		List<RepositoryModel> repositories = new ArrayList<RepositoryModel>(
 				proposal.repositories.values());
-		RepositoriesPanel repositoriesPanel = new RepositoriesPanel("repositories", false,
-				repositories, getAccessRestrictions());
+		RepositoriesPanel repositoriesPanel = new RepositoriesPanel("repositoriesPanel", false,
+				repositories, false, getAccessRestrictions());
 		add(repositoriesPanel);
 	}
 

--
Gitblit v1.9.1