Fixed #129, Fixed #126, working on 168

Author: thomaswoehlke

src/main/java/org/woehlke/simpleworklist/task/Task.java

@@ -374,4 +374,14 @@ public String getProjectUrl() {
 
         return getView(true);
     }
+
+    public void merge(Task task) {
+        this.setTitle(task.title);
+        this.setText(task.text);
+        this.setFocus(task.focus);
+        this.setTaskState(task.taskState);
+        this.setDueDate(task.dueDate);
+        this.setTaskEnergy(task.taskEnergy);
+        this.setTaskTime(task.taskTime);
+    }
 }

src/main/java/org/woehlke/simpleworklist/taskstate/TaskStateMoveController.java

@@ -185,8 +185,11 @@ public final String editTaskPost(
                 return "redirect:/project/root";
             }
             */
-
-            task = taskService.updatedViaTaskstate(task);
+            task.unsetFocus();
+            task.setRootProject();
+            Task persistentTask = taskService.findOne(task.getId());
+            persistentTask.merge(task);
+            task = taskService.updatedViaTaskstate(persistentTask);
             return "redirect:" + task.getTaskState().getUrl();
         }
     }