From 30f9d25d77ccb5cd978d4cf8fa389ec819e90e95 Mon Sep 17 00:00:00 2001
From: Philip L. McMahon <philip.l.mcmahon@gmail.com>
Date: Fri, 27 Jan 2012 02:02:19 -0500
Subject: [PATCH] Correct update of HEAD symbolic reference when target is a tag.
---
src/com/gitblit/wicket/GitBlitWebSession.java | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/wicket/GitBlitWebSession.java b/src/com/gitblit/wicket/GitBlitWebSession.java
index 34e597f..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,13 +22,17 @@
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.request.WebClientInfo;
+import com.gitblit.models.UserModel;
+
public final class GitBlitWebSession extends WebSession {
private static final long serialVersionUID = 1L;
- protected TimeZone timezone = null;
-
- private User user = null;
+ protected TimeZone timezone;
+
+ private UserModel user;
+
+ private String errorMessage;
public GitBlitWebSession(Request request) {
super(request);
@@ -23,23 +42,23 @@
super.invalidate();
user = null;
}
-
+
public boolean isLoggedIn() {
return user != null;
}
-
+
public boolean canAdmin() {
if (user == null) {
- return false;
+ return false;
}
- return user.canAdmin();
+ return user.canAdmin;
}
-
- public User getUser() {
+
+ public UserModel getUser() {
return user;
}
-
- public void setUser(User user) {
+
+ public void setUser(UserModel user) {
this.user = user;
}
@@ -54,6 +73,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