From 9889775cc7a7dab4dcf5c393a69f81d8caa4dd4e Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Wed, 4 Jul 2018 13:24:09 +0800
Subject: [PATCH]  * Set assignedTo as closed when close todo.

---
 db/update10.0.sql     | 1 +
 module/todo/model.php | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/db/update10.0.sql b/db/update10.0.sql
index 3fe85f06c1..b5b242c41c 100644
--- a/db/update10.0.sql
+++ b/db/update10.0.sql
@@ -1 +1,2 @@
 ALTER TABLE `zt_storyspec` CHANGE `title` `title` varchar(255) NOT NULL;
+update `zt_todo` set assignedTo = 'closed', assignedDate = closedDate where status = 'closed';
diff --git a/module/todo/model.php b/module/todo/model.php
index 4d56610740..6b755dd69d 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -530,10 +530,13 @@ class todoModel extends model
      */
     public function close($todoID)
     {
+        $now = helper::now();
         $this->dao->update(TABLE_TODO)
             ->set('status')->eq('closed')
             ->set('closedBy')->eq($this->app->user->account)
-            ->set('closedDate')->eq(helper::now())
+            ->set('closedDate')->eq($now)
+            ->set('assignedTo')->eq('closed')
+            ->set('assignedDate')->eq($now)
             ->where('id')->eq((int)$todoID)
             ->exec();
         $this->loadModel('action')->create('todo', $todoID, 'closed', '', 'closed');