bugfixing

Author: thomaswoehlke

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

@@ -1,37 +1,17 @@
 package org.woehlke.simpleworklist.task;
 
-import java.util.List;
-import java.util.Locale;
-
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.validation.Valid;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.annotation.*;
 import org.woehlke.simpleworklist.common.AbstractController;
-import org.woehlke.simpleworklist.taskstate.TaskMoveService;
-import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
 
 @Slf4j
 @Controller
 @RequestMapping(path = "/task")
 public class TaskController extends AbstractController {
 
-    private final TaskMoveService taskMoveService;
-    private final TaskControllerService taskControllerService;
-
-    @Autowired
-    public TaskController(TaskMoveService taskMoveService, TaskControllerService taskControllerService) {
-        this.taskMoveService = taskMoveService;
-        this.taskControllerService = taskControllerService;
-    }
-
-
     @RequestMapping(path = "/delete/{taskId}", method = RequestMethod.GET)
     public final String deleteTaskGet(@PathVariable("taskId") Task task) {
         if(task!= null){
@@ -52,8 +32,8 @@ public final String undeleteTaskGet(@PathVariable("taskId") Task task) {
 
     @RequestMapping(path = "/transform/{taskId}", method = RequestMethod.GET)
     public final String transformTaskIntoProjectGet(@PathVariable("taskId") Task task) {
-        long projectId = 0;
         if(task != null) {
+            long projectId = 0;
             if (task.getProject() != null) {
                 projectId = task.getProject().getId();
             }
@@ -68,8 +48,13 @@ public final String transformTaskIntoProjectGet(@PathVariable("taskId") Task tas
             taskService.delete(task);
             projectId = thisProject.getId();
             log.info("tried to transform Task " + task.getId() + " to new Project " + projectId);
+            if(projectId == 0){
+                return "redirect:/project/root/";
+            } else {
+                return "redirect:/project/" + projectId + "/";
+            }
         }
-        return "redirect:/project/" + projectId + "/";
+        return "redirect:/taskstate/inbox";
     }
 
 }

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

@@ -66,7 +66,10 @@ public final String editTaskPost(
         @PathVariable long taskId,
         @Valid Task task,
         @ModelAttribute("userSession") UserSessionBean userSession,
-        BindingResult result, Locale locale, Model model) {
+        BindingResult result,
+        Locale locale,
+        Model model
+    ) {
         Task persistentTask = taskService.findOne(taskId);
         long projectId = 0;
         Project thisProject;