From 627c466f7cc31582a2b9aa54f7ef91a8287fdd89 Mon Sep 17 00:00:00 2001 From: Alfred Schmid <A.Schmid@ff-muenchen.de> Date: Thu, 09 Jan 2014 07:42:54 -0500 Subject: [PATCH] Issue 356 - function updateUserModels also updates the stored teams in the UserModel. Now all Teammembers are shown when realm.ldap.synchronizeUsers.enable is turned on. --- src/main/java/com/gitblit/wicket/pages/LogoutPage.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java index ff3b507..27542bd 100644 --- a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java +++ b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java @@ -18,7 +18,6 @@ import org.apache.wicket.protocol.http.WebRequest; import org.apache.wicket.protocol.http.WebResponse; -import com.gitblit.GitBlit; import com.gitblit.models.UserModel; import com.gitblit.wicket.GitBlitWebSession; @@ -28,8 +27,7 @@ super(); GitBlitWebSession session = GitBlitWebSession.get(); UserModel user = session.getUser(); - GitBlit.self().setCookie((WebResponse) getResponse(), null); - GitBlit.self().logout(user); + app().authentication().logout(((WebResponse) getResponse()).getHttpServletResponse(), user); session.invalidate(); /* -- Gitblit v1.9.1