work

Author: thomaswoehlke

src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java

@@ -82,6 +82,7 @@ public final String projectTaskAddGet(
         model.addAttribute("breadcrumb", breadcrumb);
         model.addAttribute("task", task);
         model.addAttribute("userSession", userSession);
+        model.addAttribute("dataPage", true);
         return "project/id/task/add";
     }
 
@@ -95,6 +96,7 @@ public final String projectTaskAddPost(
     ) {
         Context context = super.getContext(userSession);
         UserAccount userAccount = context.getUserAccount();
+        model.addAttribute("dataPage", true);
         if (result.hasErrors()) {
             for (ObjectError e : result.getAllErrors()) {
                 log.info(e.toString());
@@ -166,6 +168,7 @@ public final String project(
             model.addAttribute("isDeleted",isDeleted);
         }
         model.addAttribute("userSession", userSession);
+         model.addAttribute("dataPage", true);
         return "project/id/show";
     }
 
@@ -179,6 +182,7 @@ public final String projectAddProjectGet(
         Context context = super.getContext(userSession);
         projectControllerService.addNewProjectToProjectIdForm(projectId, userSession, context, locale, model);
         model.addAttribute("userSession", userSession);
+        model.addAttribute("dataPage", true);
         return "project/id/project/add";
     }
 
@@ -215,6 +219,7 @@ public final String projectMoveToProjectGet(
         Project targetProject = projectService.findByProjectId(targetProjectId);
         thisProject = projectService.moveProjectToAnotherProject(thisProject, targetProject );
         model.addAttribute("userSession", userSession);
+        model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -235,6 +240,7 @@ public final String projectEditGet(
         model.addAttribute("thisProject", thisProject);
         model.addAttribute("project", thisProject);
         model.addAttribute("userSession", userSession);
+        model.addAttribute("dataPage", true);
         return "project/id/edit";
     }
 
@@ -249,6 +255,7 @@ public final String projectEditPost(
         Context context = super.getContext(userSession);
         UserAccount thisUser = context.getUserAccount();
         Project thisProject;
+      model.addAttribute("dataPage", true);
         if (result.hasErrors()) {
             for (ObjectError e : result.getAllErrors()) {
                 log.info(e.toString());
@@ -327,6 +334,7 @@ public final String projectDeleteGet(
             model.addAttribute("breadcrumb", breadcrumb);
             model.addAttribute("thisProject", project);
             model.addAttribute("userSession", userSession);
+          model.addAttribute("dataPage", true);
             return "project/id/show";
         }
     }
@@ -352,6 +360,7 @@ public String moveTaskToTaskAndChangeTaskOrderInProject(
         log.info("  DONE: taskMoveService.moveOrderIdProject");
         log.info("-------------------------------------------------");
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -365,6 +374,7 @@ public final String moveAllCompletedToTrash(
         Context context = super.getContext(userSession);
         taskService.moveAllCompletedToTrash(context);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -378,6 +388,7 @@ public final String emptyTrash(
         Context context = super.getContext(userSession);
         taskService.emptyTrash(context);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -400,6 +411,7 @@ public final String editTaskGet(
         model.addAttribute("task", task);
         model.addAttribute("contexts", contexts);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return "project/id/task/edit";
     }
 
@@ -414,6 +426,7 @@ public final String editTaskPost(
         Model model
     ) {
         log.info("editTaskPost");
+      model.addAttribute("dataPage", true);
         if(task.getTaskState()==TaskState.SCHEDULED && task.getDueDate()==null){
             String objectName="task";
             String field="dueDate";
@@ -473,6 +486,7 @@ public final String setDoneTaskGet(
         task.setOrderIdTaskState(++maxOrderIdTaskState);
         task = taskService.updatedViaTaskstate(task);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -489,6 +503,7 @@ public final String unsetDoneTaskGet(
         task.setOrderIdTaskState(++maxOrderIdTaskState);
         task = taskService.updatedViaTaskstate(task);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -503,6 +518,7 @@ public final String setFocusGet(
         task.setFocus();
         task = taskService.updatedViaTaskstate(task);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -517,6 +533,7 @@ public final String unsetFocusGet(
         task.unsetFocus();
         task = taskService.updatedViaTaskstate(task);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -529,6 +546,7 @@ public final String moveTaskToAnotherProject(
     ) {
         task = taskService.moveTaskToRootProject(task);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return "redirect:/project/root";
     }
 
@@ -542,6 +560,7 @@ public final String moveTaskToAnotherProject(
     ) {
         task = taskService.moveTaskToAnotherProject(task,otherProject);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return otherProject.getUrl();
     }
 
@@ -556,6 +575,7 @@ public final String moveTaskToInbox(
         task.moveToInbox();
         taskService.updatedViaTaskstate(task);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -570,6 +590,7 @@ public final String moveTaskToToday(
         task.moveToToday();
         taskService.updatedViaTaskstate(task);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -584,6 +605,7 @@ public final String moveTaskToNext(
         task.moveToNext();
         taskService.updatedViaTaskstate(task);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -598,6 +620,7 @@ public final String moveTaskToWaiting(
         task.moveToWaiting();
         taskService.updatedViaTaskstate(task);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -612,6 +635,7 @@ public final String moveTaskToSomeday(
         task.moveToSomeday();
         taskService.updatedViaTaskstate(task);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -626,6 +650,7 @@ public final String moveTaskToFocus(
         task.moveToFocus();
         taskService.updatedViaTaskstate(task);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -640,6 +665,7 @@ public final String moveTaskToCompleted(
         task.moveToCompletedTasks();
         taskService.updatedViaTaskstate(task);
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -657,6 +683,7 @@ public final String moveTaskToTrash(
         userSession.setLastTaskState(task.getTaskState());
         userSession.setLastTaskId(task.getId());
         model.addAttribute("userSession", userSession);
+      model.addAttribute("dataPage", true);
         return thisProject.getUrl();
     }
 
@@ -671,6 +698,7 @@ public final String transformTaskIntoProjectGet(
         userSession.setLastProjectId(thisProject.getId());
         userSession.setLastTaskState(task.getTaskState());
         userSession.setLastTaskId(task.getId());
+      model.addAttribute("dataPage", true);
         return transformTaskIntoProjektService.transformTaskIntoProjectGet(task, userSession, model);
     }
 }