work

Author: thomaswoehlke

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

@@ -207,31 +207,19 @@ protected Project addProjectFromTaskToModel(Task task, Model model){
 
     protected Task addProject(Task task){
       Task persistentTask = taskService.findOne(task.getId());
-      if(
-        task.getProject() != null
-        && task.getProject().getId() != null
-        && task.getProject().getId() != 0L
-      ){
-        Long pid_task = task.getProject().getId();
-        if (
-          persistentTask.getProject() != null
-          && persistentTask.getProject().getId() != null
-          && persistentTask.getProject().getId() != 0L
-        ) {
-          Long pid_persistent_task = persistentTask.getProject().getId();
-          if(pid_task != null && pid_task != 0L) {
-            Project newProject = projectService.findByProjectId(pid_task);
-            persistentTask.setProject(newProject);
-            if (pid_persistent_task != null && pid_persistent_task != 0L) {
-              if (!newProject.equals(persistentTask.getProject())) {
-                persistentTask.setLastProject(persistentTask.getProject());
-              }
-            } else {
-              persistentTask.setLastProject(null);
-            }
-          } else {
-            persistentTask.setProject(null);
-          }
+      if (task.getProject() == null || task.getProject().getId() == null || task.getProject().getId() == 0L) {
+        persistentTask.setProject(null);
+        if (persistentTask.getProject() == null || persistentTask.getProject().getId() == null || persistentTask.getProject().getId() == 0L) {
+          persistentTask.setLastProject(null);
+        } else {
+          persistentTask.setLastProject(persistentTask.getProject());
+        }
+      } else {
+        persistentTask.setProject(task.getProject());
+        if (persistentTask.getProject() == null || persistentTask.getProject().getId() == null || persistentTask.getProject().getId() == 0L) {
+          persistentTask.setLastProject(null);
+        } else {
+          persistentTask.setLastProject(persistentTask.getProject());
         }
       }
       persistentTask.merge(task);

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

@@ -163,10 +163,10 @@ public final String editTaskPost(
                 log.warn(e.toString());
             }
             //Task persistentTask = taskService.findOne(taskId);
-            task = addProject(task);
             UserAccount userAccount = userAccountLoginSuccessService.retrieveCurrentUser();
             List<Context> contexts = contextService.getAllForUser(userAccount);
             Project thisProject = addProjectFromTaskToModel( task, model );
+            // task = addProject(task);
             Context thisContext = task.getContext();
             Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale,userSession);
             model.addAttribute("breadcrumb", breadcrumb);