## 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)
* Issue #329 AbstractController: remove side effects from getContext (line 145, 159)

Author: thomaswoehlke

etc/TODO.md

@@ -61,8 +61,11 @@
 * fixed #325 add version for optimistic locking to org.woehlke.simpleworklist.domain.task.Task
 
 ## 2.3.34
-* Issue #317 switch Context is broken
+* 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)
+* Issue #329 AbstractController: remove side effects from getContext (line 145, 159) 
 
 ## 2.3.35  
 * Issue #234 Taskstate: Task Edit Form -> change Project via DropDown

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

@@ -23,6 +23,7 @@
 import org.woehlke.simpleworklist.user.services.UserAccountAccessService;
 import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;
 
+import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -76,9 +77,7 @@ public final List<Project> getAllCategories(
     //TODO: rename rootCategories to rootProjects
     @ModelAttribute("rootCategories")
     public final List<Project> getRootCategories(
-        @ModelAttribute("userSession") UserSessionBean userSession,
-        BindingResult result,  //TODO: remove
-        Model model  //TODO: remove
+        @ModelAttribute("userSession") UserSessionBean userSession
     ) {
         Context context = this.getContext(userSession);
         return projectService.findRootProjectsByContext(context);
@@ -143,6 +142,20 @@ protected UserAccount getUser() {
         return this.userAccountLoginSuccessService.retrieveCurrentUser();
     }
 
+    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());
+        return context;
+    }
+
+    /*
     protected Context getContext(UserSessionBean userSession){
         UserAccount thisUser = this.getUser();
         if(userSession == null){
@@ -155,5 +168,6 @@ protected Context getContext(UserSessionBean userSession){
         userSession.setUserAccountid(thisUser.getId());
         return context;
     }
+    */
 
 }