From 37864ade1f2ab700e496394b8032dbba9b97f2c0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 20 Sep 2012 08:08:21 -0400
Subject: [PATCH] Merge branch 'delete-branch' of https://github.com/ajermakovics/gitblit
---
src/com/gitblit/wicket/pages/RepositoryPage.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java
index 7e21911..6971946 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoryPage.java
@@ -75,6 +75,7 @@
private Map<String, SubmoduleModel> submodules;
private final Map<String, PageRegistration> registeredPages;
+ private boolean showAdmin;
public RepositoryPage(PageParameters params) {
super(params);
@@ -148,7 +149,7 @@
}
// Conditionally add edit link
- final boolean showAdmin;
+ this.showAdmin = false;
if (GitBlit.getBoolean(Keys.web.authenticateAdminPages, true)) {
boolean allowAdmin = GitBlit.getBoolean(Keys.web.allowAdministration, false);
showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
@@ -412,6 +413,11 @@
return WicketUtils.newObjectParameter(repositoryName, commitId);
}
+ public boolean isShowAdmin()
+ {
+ return this.showAdmin;
+ }
+
private class SearchForm extends SessionlessForm<Void> implements Serializable {
private static final long serialVersionUID = 1L;
--
Gitblit v1.9.1