From c658df9e87d65b08d5482cf04489cb0532ff83dd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 13 Oct 2012 10:50:35 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/Mrbytes/gitblit
---
src/com/gitblit/wicket/GitBlitWebSession.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/wicket/GitBlitWebSession.java b/src/com/gitblit/wicket/GitBlitWebSession.java
index 7ecc05b..015d97a 100644
--- a/src/com/gitblit/wicket/GitBlitWebSession.java
+++ b/src/com/gitblit/wicket/GitBlitWebSession.java
@@ -17,6 +17,7 @@
import java.util.Map;
import java.util.TimeZone;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.wicket.Page;
import org.apache.wicket.PageParameters;
@@ -42,8 +43,11 @@
private String requestUrl;
+ private AtomicBoolean isForking;
+
public GitBlitWebSession(Request request) {
super(request);
+ isForking = new AtomicBoolean();
}
public void invalidate() {
@@ -99,7 +103,7 @@
if (user == null) {
return false;
}
- return user.canAdmin;
+ return user.canAdmin();
}
public String getUsername() {
@@ -134,6 +138,14 @@
errorMessage = null;
return msg;
}
+
+ public boolean isForking() {
+ return isForking.get();
+ }
+
+ public void isForking(boolean val) {
+ isForking.set(val);
+ }
public static GitBlitWebSession get() {
return (GitBlitWebSession) Session.get();
--
Gitblit v1.9.1