From ff4a7a48ed25a891368d8082218fb5904a7df1a3 Mon Sep 17 00:00:00 2001
From: Mrbytes <eguervos@msn.com>
Date: Tue, 18 Dec 2012 13:26:30 -0500
Subject: [PATCH] GitBlitWebApp_es.properties: Up-to-date. Some minor changes in syntax for better compression.
---
src/com/gitblit/wicket/pages/ReviewProposalPage.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/ReviewProposalPage.java b/src/com/gitblit/wicket/pages/ReviewProposalPage.java
index b006d80..e181386 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(WicketUtils.createTimestampLabel("received", proposal.received, getTimeZone(), getTimeUtils()));
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,
+ false, repositories, false, getAccessRestrictions());
add(repositoriesPanel);
}
--
Gitblit v1.9.1