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 |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/com/gitblit/wicket/GitBlitWebSession.java b/src/com/gitblit/wicket/GitBlitWebSession.java
index 4996546..2238660 100644
--- a/src/com/gitblit/wicket/GitBlitWebSession.java
+++ b/src/com/gitblit/wicket/GitBlitWebSession.java
@@ -1,3 +1,18 @@
+/*
+ * 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.util.TimeZone;
@@ -7,17 +22,17 @@
 import org.apache.wicket.protocol.http.WebSession;
 import org.apache.wicket.protocol.http.request.WebClientInfo;
 
-import com.gitblit.wicket.models.UserModel;
+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 = null;
-	
-	private String errorMessage = null;
+	private UserModel user;
+
+	private String errorMessage;
 
 	public GitBlitWebSession(Request request) {
 		super(request);
@@ -36,7 +51,7 @@
 		if (user == null) {
 			return false;
 		}
-		return user.canAdmin();
+		return user.canAdmin;
 	}
 
 	public UserModel getUser() {
@@ -57,11 +72,11 @@
 		}
 		return timezone;
 	}
-	
+
 	public void cacheErrorMessage(String message) {
 		this.errorMessage = message;
 	}
-	
+
 	public String clearErrorMessage() {
 		String msg = errorMessage;
 		errorMessage = null;

--
Gitblit v1.9.1