Refresh authenticated user model for each page request (issue-186)

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index d77c732621fcd380adb0f0546a991e93a76167c0..3d17a9b29ec64f2ad35ca8beaccb4f52fcabd8f5 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -6,7 +6,8 @@
 \r
 #### fixes\r
 \r
-- Fixed nullpointer on recursively calculating folder sizes when there is a named pipe in the hierarchy\r
+- Fixed nullpointer on recursively calculating folder sizes when there is a named pipe or symlink in the hierarchy\r
+- Fixed bug where permission changes were not visible in the web ui to a logged-in user until the user logged-out and then logged back in again (issue-186)\r
 - Fixed nullpointer on creating a repository with mixed case (issue 185)\r
 - Fixed nullpointer when using web.allowForking = true && git.cacheRepositoryList = false (issue 182)\r
 - Build project models from the repository model cache, when possible, to reduce page load time (issue 172)\r

diff --git a/src/com/gitblit/wicket/pages/BasePage.java b/src/com/gitblit/wicket/pages/BasePage.java
index 9f9813531752473234b473abcce2eed35c7b7988..c733c99257baa54467cc55f62e84071adfff6cc5 100644 (file)
--- a/src/com/gitblit/wicket/pages/BasePage.java
+++ b/src/com/gitblit/wicket/pages/BasePage.java
@@ -136,7 +136,10 @@ public abstract class BasePage extends WebPage {
        private void login() {\r
                GitBlitWebSession session = GitBlitWebSession.get();\r
                if (session.isLoggedIn() && !session.isSessionInvalidated()) {\r
-                       // already have a session\r
+                       // already have a session, refresh usermodel to pick up\r
+                       // any changes to permissions or roles (issue-186)\r
+                       UserModel user = GitBlit.self().getUserModel(session.getUser().username);\r
+                       session.setUser(user);\r
                        return;\r
                }\r
                \r