summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-12-03 13:47:08 -0600
committerJames Moger <james.moger@gitblit.com>2014-12-03 13:47:08 -0600
commitafb98a26157f9aa132d4beb0e743519f53e97104 (patch)
treeeea9dd473c51b77b0e8d7fb5df7e459b94291c97 /src/main/java
parent9f92fb94aa403928a2efe5e673e118b3b02ba291 (diff)
parent0e287b2e5c29e7674e54d80ed90e79f5b5432968 (diff)
downloadgitblit-afb98a26157f9aa132d4beb0e743519f53e97104.tar.gz
gitblit-afb98a26157f9aa132d4beb0e743519f53e97104.zip
Merged #226 "Added a new property: web.displayUserPanel"
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/gitblit/wicket/pages/RootPage.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java
index c4d4dd11..37e98702 100644
--- a/src/main/java/com/gitblit/wicket/pages/RootPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java
@@ -151,6 +151,7 @@ public abstract class RootPage extends BasePage {
boolean authenticateAdmin = app().settings().getBoolean(Keys.web.authenticateAdminPages, true);
boolean allowAdmin = app().settings().getBoolean(Keys.web.allowAdministration, true);
boolean allowLucene = app().settings().getBoolean(Keys.web.allowLuceneIndexing, true);
+ boolean displayUserPanel = app().settings().getBoolean(Keys.web.displayUserPanel, true);
boolean isLoggedIn = GitBlitWebSession.get().isLoggedIn();
if (authenticateAdmin) {
@@ -168,7 +169,7 @@ public abstract class RootPage extends BasePage {
}
}
- if (authenticateView || authenticateAdmin) {
+ if (displayUserPanel && (authenticateView || authenticateAdmin)) {
if (isLoggedIn) {
UserMenu userFragment = new UserMenu("userPanel", "userMenuFragment", RootPage.this);
add(userFragment);