From 9da97003c7f33a64ae5060f413f9c4c5d26efe78 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 19 May 2011 19:01:45 -0400
Subject: [PATCH] Critical fix for servlet.
---
src/com/gitblit/wicket/GitBlitWebSession.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/wicket/GitBlitWebSession.java b/src/com/gitblit/wicket/GitBlitWebSession.java
index b2106e7..4996546 100644
--- a/src/com/gitblit/wicket/GitBlitWebSession.java
+++ b/src/com/gitblit/wicket/GitBlitWebSession.java
@@ -7,13 +7,17 @@
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.request.WebClientInfo;
+import com.gitblit.wicket.models.UserModel;
+
public final class GitBlitWebSession extends WebSession {
private static final long serialVersionUID = 1L;
protected TimeZone timezone = null;
+
+ private UserModel user = null;
- private User user = null;
+ private String errorMessage = null;
public GitBlitWebSession(Request request) {
super(request);
@@ -23,16 +27,23 @@
super.invalidate();
user = null;
}
-
+
public boolean isLoggedIn() {
return user != null;
}
-
- public User getUser() {
+
+ public boolean canAdmin() {
+ if (user == null) {
+ return false;
+ }
+ return user.canAdmin();
+ }
+
+ public UserModel getUser() {
return user;
}
-
- public void setUser(User user) {
+
+ public void setUser(UserModel user) {
this.user = user;
}
@@ -46,6 +57,16 @@
}
return timezone;
}
+
+ public void cacheErrorMessage(String message) {
+ this.errorMessage = message;
+ }
+
+ public String clearErrorMessage() {
+ String msg = errorMessage;
+ errorMessage = null;
+ return msg;
+ }
public static GitBlitWebSession get() {
return (GitBlitWebSession) Session.get();
--
Gitblit v1.9.1