From d1f12af94b21a04c3cf96caf1ab83c4bdf552236 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 09 Feb 2012 17:48:11 -0500 Subject: [PATCH] Reversed the order of buttons on all forms so that default is submit --- src/com/gitblit/wicket/GitBlitWebSession.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/src/com/gitblit/wicket/GitBlitWebSession.java b/src/com/gitblit/wicket/GitBlitWebSession.java index 038118e..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,11 +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; + protected TimeZone timezone; + + private UserModel user; + + private String errorMessage; public GitBlitWebSession(Request request) { super(request); @@ -19,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() { @@ -32,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