Fixed #129, Fixed #126, working on 168

Author: thomaswoehlke

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

@@ -98,7 +98,7 @@ public final String editTaskPost(
             if(task.getDueDate()==null){
                 persistentTask.setDueDate(null);
                 if(persistentTask.getTaskState().compareTo(TaskState.SCHEDULED)==0){
-                    persistentTask.setTaskState(TaskState.INBOX);
+                    persistentTask.setTaskState(task.getTaskState());
                 }
             } else {
                 persistentTask.setDueDate(task.getDueDate());

src/main/resources/templates/taskstate/task/edit.html

@@ -36,7 +36,7 @@ <h1>
 			</div>
             <span class="form-group">
                 <label th:for="${#ids.next('listTaskState')}" class="control-label">
-                    <span th:utext="#{task.show.taskState}">taskState</span>
+                    <span th:utext="#{tasks.col.taskState}">taskState</span>
                 </label>
                 <select th:field="*{taskState}">
                     <option th:each="taskStateItem : ${listTaskState}"