From e299e1e9071d02ceefa2b5154f0fd1af5cbe115e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 17 Apr 2011 16:57:41 -0400
Subject: [PATCH] Finished history tree/blob links.
---
src/com/gitblit/wicket/GitBlitWebSession.java | 58 ++++++++++++++++++++++------------------------------------
1 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/src/com/gitblit/wicket/GitBlitWebSession.java b/src/com/gitblit/wicket/GitBlitWebSession.java
index 1eccb70..92eaff6 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,13 @@
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;
public GitBlitWebSession(Request request) {
super(request);
@@ -25,6 +21,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() {
@@ -36,36 +52,6 @@
timezone = TimeZone.getDefault();
}
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 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"));
- df.setTimeZone(getTimezone());
- return df.format(date);
}
public static GitBlitWebSession get() {
--
Gitblit v1.9.1