From 27ae9095639bb228a1b7ff86a3ebe4264abf05be Mon Sep 17 00:00:00 2001
From: mschaefers <mschaefers@scoop-gmbh.de>
Date: Thu, 29 Nov 2012 12:33:09 -0500
Subject: [PATCH] feature: when using LdapUserService one can configure Gitblit to fetch all users from ldap that can possibly login. This allows to see newly generated LDAP users instantly in Gitblit. By now an LDAP user had to log in once to appear in GitBlit.
---
src/com/gitblit/wicket/pages/ReviewProposalPage.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/ReviewProposalPage.java b/src/com/gitblit/wicket/pages/ReviewProposalPage.java
index 0fc1de3..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
@@ -80,6 +79,7 @@
sb.append(asParam(p, proposal.name, "frequency",
GitBlit.getString(Keys.federation.defaultFrequency, "60 mins")));
sb.append(asParam(p, proposal.name, "folder", proposal.name));
+ sb.append(asParam(p, proposal.name, "bare", "true"));
sb.append(asParam(p, proposal.name, "mirror", "true"));
sb.append(asParam(p, proposal.name, "sendStatus", "true"));
sb.append(asParam(p, proposal.name, "notifyOnError", "true"));
@@ -91,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