From cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Jan 2012 17:34:05 -0500
Subject: [PATCH] Fixed bug in receive hook for repositories in subfolders
---
src/com/gitblit/wicket/GitBlitWebSession.java | 79 +++++++++++++++++++++++----------------
1 files changed, 47 insertions(+), 32 deletions(-)
diff --git a/src/com/gitblit/wicket/GitBlitWebSession.java b/src/com/gitblit/wicket/GitBlitWebSession.java
index 1eccb70..2238660 100644
--- a/src/com/gitblit/wicket/GitBlitWebSession.java
+++ b/src/com/gitblit/wicket/GitBlitWebSession.java
@@ -1,8 +1,20 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
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 +22,17 @@
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.request.WebClientInfo;
-import com.gitblit.StoredSettings;
-
+import com.gitblit.models.UserModel;
public final class GitBlitWebSession extends WebSession {
private static final long serialVersionUID = 1L;
- protected TimeZone timezone = null;
+ protected TimeZone timezone;
+
+ private UserModel user;
+
+ private String errorMessage;
public GitBlitWebSession(Request request) {
super(request);
@@ -25,6 +40,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 UserModel getUser() {
+ return user;
+ }
+
+ public void setUser(UserModel user) {
+ this.user = user;
}
public TimeZone getTimezone() {
@@ -38,34 +73,14 @@
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"));
- 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