From 39ca01c3e8f2d218b37d38494bc9411eb17fbc04 Mon Sep 17 00:00:00 2001
From: bel <me@me.me>
Date: Tue, 21 Jan 2020 06:34:26 +0000
Subject: [PATCH] fix

---
 server/ajax/task.go      | 32 ++++++++++++++++----------------
 server/ajax/task_test.go |  9 +++++----
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/server/ajax/task.go b/server/ajax/task.go
index 541cc88..eba4725 100755
--- a/server/ajax/task.go
+++ b/server/ajax/task.go
@@ -95,7 +95,7 @@ func (a *Ajax) deleteTask(w http.ResponseWriter, r *http.Request) error {
 	if err := a.storageDelTask(taskID); err != nil {
 		return err
 	}
-	return json.NewEncoder(w).Encode(map[string]int{"total": 1})
+	return json.NewEncoder(w).Encode(map[string]interface{}{"total": 0})
 }
 
 func (a *Ajax) completeTask(w http.ResponseWriter, r *http.Request) error {
@@ -119,57 +119,57 @@ func (a *Ajax) completeTask(w http.ResponseWriter, r *http.Request) error {
 
 func (a *Ajax) editNote(w http.ResponseWriter, r *http.Request) error {
 	listID, taskID, _ := a.Cur(r)
-	task, err := a.storageGetTask(taskID)
+	editedTask, err := a.storageGetTask(taskID)
 	if err != nil {
 		return err
 	}
-	task.SetNote(form.Get(r, "note"))
-	if err := a.storageSetTask(listID, task); err != nil {
+	editedTask.SetNote(form.Get(r, "note"))
+	if err := a.storageSetTask(listID, editedTask); err != nil {
 		return err
 	}
-	return json.NewEncoder(w).Encode(map[string]int{"total": 1})
+	return json.NewEncoder(w).Encode(map[string]interface{}{"total": 1, "list": []*task.Task{editedTask}})
 }
 
 func (a *Ajax) editTask(w http.ResponseWriter, r *http.Request) error {
-	listID, task, err := a.makeTask(r)
+	listID, editedTask, err := a.makeTask(r)
 	if err != nil {
 		return err
 	}
 	_, taskID, _ := a.Cur(r)
-	task.UUID = taskID
-	if err := a.storageSetTask(listID, task); err != nil {
+	editedTask.UUID = taskID
+	if err := a.storageSetTask(listID, editedTask); err != nil {
 		return err
 	}
-	return json.NewEncoder(w).Encode(map[string]int{"total": 1})
+	return json.NewEncoder(w).Encode(map[string]interface{}{"total": 1, "list": []*task.Task{editedTask}})
 }
 
 func (a *Ajax) setPrio(w http.ResponseWriter, r *http.Request) error {
 	listID, taskID, _ := a.Cur(r)
-	task, err := a.storageGetTask(taskID)
+	editedTask, err := a.storageGetTask(taskID)
 	if err != nil {
 		return err
 	}
-	task.SetPrio(form.ToInt(form.Get(r, "prio")))
-	if err := a.storageSetTask(listID, task); err != nil {
+	editedTask.SetPrio(form.ToInt(form.Get(r, "prio")))
+	if err := a.storageSetTask(listID, editedTask); err != nil {
 		return err
 	}
-	return json.NewEncoder(w).Encode(map[string]int{"total": 1})
+	return json.NewEncoder(w).Encode(map[string]interface{}{"total": 1, "list": []*task.Task{editedTask}})
 }
 
 func (a *Ajax) moveTask(w http.ResponseWriter, r *http.Request) error {
 	_, taskID, _ := a.Cur(r)
 	toList := form.Get(r, "to")
-	task, err := a.storageGetTask(taskID)
+	movedTask, err := a.storageGetTask(taskID)
 	if err != nil {
 		return err
 	}
 	if err := a.storageDelTask(taskID); err != nil {
 		return err
 	}
-	if err := a.storageSetTask(toList, task); err != nil {
+	if err := a.storageSetTask(toList, movedTask); err != nil {
 		return err
 	}
-	return json.NewEncoder(w).Encode(map[string]int{"total": 1})
+	return json.NewEncoder(w).Encode(map[string]interface{}{"total": 1, "list": []*task.Task{movedTask}})
 }
 
 func (a *Ajax) parseTaskStr(w http.ResponseWriter, r *http.Request) error {
diff --git a/server/ajax/task_test.go b/server/ajax/task_test.go
index 2f17728..9be0df7 100755
--- a/server/ajax/task_test.go
+++ b/server/ajax/task_test.go
@@ -210,17 +210,18 @@ func TestAjaxChangeOrder(t *testing.T) {
 }
 
 func TestFilterComplete(t *testing.T) {
-	task := &task.Task{Complete: false}
 	cases := []struct {
 		query string
+		task  bool
 		out   bool
 	}{
-		{query: "", out: true},
-		{query: "0", out: true},
-		{query: "1", out: false},
+		{query: "", out: true, task: false},
+		{query: "0", out: true, task: false},
+		{query: "1", out: true, task: false},
 	}
 
 	for name, c := range cases {
+		task := &task.Task{Complete: c.task}
 		out := filterComplete(c.query)
 		if out(task) != c.out {
 			t.Errorf("[%d] want %v, got %v", name, c.out, out(task))