From cf9550d8df51d927c63176675280d69b86e7a6e2 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 04 May 2011 17:35:49 -0400
Subject: [PATCH] Build infrastructure improvements. Setting to show remote branches.
---
src/com/gitblit/wicket/GitBlitWebSession.java | 66 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/src/com/gitblit/wicket/GitBlitWebSession.java b/src/com/gitblit/wicket/GitBlitWebSession.java
index 0a15466..58ba495 100644
--- a/src/com/gitblit/wicket/GitBlitWebSession.java
+++ b/src/com/gitblit/wicket/GitBlitWebSession.java
@@ -1,8 +1,5 @@
package com.gitblit.wicket;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.TimeZone;
import org.apache.wicket.Request;
@@ -10,14 +7,15 @@
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.request.WebClientInfo;
-import com.gitblit.StoredSettings;
-
-
public final class GitBlitWebSession extends WebSession {
private static final long serialVersionUID = 1L;
protected TimeZone timezone = null;
+
+ private User user = null;
+
+ private String errorMessage = null;
public GitBlitWebSession(Request request) {
super(request);
@@ -25,6 +23,26 @@
public void invalidate() {
super.invalidate();
+ user = null;
+ }
+
+ public boolean isLoggedIn() {
+ return user != null;
+ }
+
+ public boolean canAdmin() {
+ if (user == null) {
+ return false;
+ }
+ return user.canAdmin();
+ }
+
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
}
public TimeZone getTimezone() {
@@ -37,35 +55,15 @@
}
return timezone;
}
-
- public String formatTime(Date date) {
- DateFormat df = new SimpleDateFormat(StoredSettings.getString("timestampFormat", "h:mm a"));
- df.setTimeZone(getTimezone());
- return df.format(date);
+
+ public void cacheErrorMessage(String message) {
+ this.errorMessage = message;
}
-
- public String formatDate(Date date) {
- DateFormat df = new SimpleDateFormat(StoredSettings.getString("datestampShortFormat", "MM/dd/yy"));
- df.setTimeZone(getTimezone());
- return df.format(date);
- }
-
- public String formatDateLong(Date date) {
- DateFormat df = new SimpleDateFormat(StoredSettings.getString("datestampLongFormat", "EEEE, MMMM d, yyyy"));
- df.setTimeZone(getTimezone());
- return df.format(date);
- }
-
- public String formatDateTime(Date date) {
- DateFormat df = new SimpleDateFormat(StoredSettings.getString("datetimestampShortFormat", "MM/dd/yy h:mm a"));
- df.setTimeZone(getTimezone());
- return df.format(date);
- }
-
- public String formatDateTimeLong(Date date) {
- DateFormat df = new SimpleDateFormat(StoredSettings.getString("datetimestampLongFormat", "EEEE, MMMM d, yyyy h:mm a z"));
- df.setTimeZone(getTimezone());
- return df.format(date);
+
+ public String clearErrorMessage() {
+ String msg = errorMessage;
+ errorMessage = null;
+ return msg;
}
public static GitBlitWebSession get() {
--
Gitblit v1.9.1