From 155bf78e3377910d29b2c912f58c0f496cb428e8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 14 Apr 2011 19:44:47 -0400
Subject: [PATCH] Generate Keys class from gitblit.properties as part of build process.
---
src/com/gitblit/wicket/pages/RepositoriesPage.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java
index 3a43b0d..eca216c 100644
--- a/src/com/gitblit/wicket/pages/RepositoriesPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java
@@ -18,6 +18,7 @@
import org.apache.wicket.model.Model;
import com.gitblit.GitBlit;
+import com.gitblit.Keys;
import com.gitblit.StoredSettings;
import com.gitblit.utils.Utils;
import com.gitblit.wicket.BasePage;
@@ -26,27 +27,26 @@
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.models.RepositoryModel;
-
public class RepositoriesPage extends BasePage {
public RepositoriesPage() {
super();
setupPage("", "");
-
+
boolean showAdmin = false;
- if (StoredSettings.getBoolean("authenticateWebUI", true)) {
- boolean allowAdmin = StoredSettings.getBoolean("allowAdministration", false);
- showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
+ if (StoredSettings.getBoolean(Keys.web_authenticate, true)) {
+ boolean allowAdmin = StoredSettings.getBoolean(Keys.web_allowAdministration, false);
+ showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
} else {
- showAdmin = StoredSettings.getBoolean("allowAdministration", false);
+ showAdmin = StoredSettings.getBoolean(Keys.web_allowAdministration, false);
}
-
+
Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);
adminLinks.add(new BookmarkablePageLink<Void>("newRepository", RepositoriesPage.class));
- adminLinks.add(new BookmarkablePageLink<Void>("newUser", RepositoriesPage.class));
+ adminLinks.add(new BookmarkablePageLink<Void>("newUser", RepositoriesPage.class));
add(adminLinks.setVisible(showAdmin));
-
- add(new Label("repositoriesMessage", StoredSettings.getString("repositoriesMessage", "")).setEscapeModelStrings(false));
+
+ add(new Label("repositoriesMessage", StoredSettings.getString(Keys.web_repositoriesMessage, "")).setEscapeModelStrings(false));
List<RepositoryModel> rows = GitBlit.self().getRepositories(getRequest());
DataProvider dp = new DataProvider(rows);
--
Gitblit v1.9.1