## 2.3.34

* fixed #317 switch Context is broken
* fixed #326 add Context to Breadcrumb
* Issue #327 AbstractController: rename rootCategories to rootProjects (line 77)
* Issue #328 AbstractController: rename allCategories to allProjects (line 66)
* fixed #329 AbstractController: remove side effects from getContext (line 145, 159)
* Issue #330 Add Project to Root Project: preset correct Context

Author: thomaswoehlke

etc/TODO.md

@@ -65,7 +65,7 @@
 * fixed #326 add Context to Breadcrumb
 * Issue #327 AbstractController: rename rootCategories to rootProjects (line 77)
 * Issue #328 AbstractController: rename allCategories to allProjects (line 66)
-* Issue #329 AbstractController: remove side effects from getContext (line 145, 159) 
+* fixed #329 AbstractController: remove side effects from getContext (line 145, 159) 
 * Issue #330 Add Project to Root Project: preset correct Context 
 
 ## 2.3.35  

src/main/java/org/woehlke/simpleworklist/common/domain/AbstractController.java

@@ -144,14 +144,13 @@ protected UserAccount getUser() {
 
     protected Context getContext(@NotNull final UserSessionBean userSession){
         UserAccount thisUser = this.getUser();
-        //if(userSession == null){
-        //    userSession = new UserSessionBean();
-        //}
         long defaultContextId = thisUser.getDefaultContext().getId();
-        //userSession.setLastContextId(defaultContextId);
-        Context context = contextService.findByIdAndUserAccount(userSession.getLastContextId(), thisUser);
-        //userSession.setLastContextId(context.getId());
-        //userSession.setUserAccountid(thisUser.getId());
+        long userSessionLastContextId = userSession.getLastContextId();
+        long newContextId = userSessionLastContextId;
+        if(userSessionLastContextId == 0L){
+            newContextId = defaultContextId;
+        }
+        Context context = contextService.findByIdAndUserAccount(newContextId, thisUser);
         return context;
     }