From 1e0b3905dd18ae44a5d384cfaa33ad822db2fc44 Mon Sep 17 00:00:00 2001 From: "chencongzhi520@gmail.com" Date: Sun, 22 Apr 2012 07:10:16 +0000 Subject: [PATCH] + code for task#754 --- module/task/model.php | 12 +++++++----- module/task/view/assignto.html.php | 4 ++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index 65fece18b3..df3b06f4a5 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -215,11 +215,13 @@ class taskModel extends model { $now = helper::now(); $oldTask = $this->getById($taskID); - $this->dao->update(TABLE_TASK) - ->set('assignedTo')->eq($this->post->assignedTo) - ->set('lastEditedBy')->eq($this->app->user->account) - ->set('lastEditedDate')->eq($now) - ->where('id')->eq($taskID)->exec(); + $task = fixer::input('post') + ->setDefault('lastEditedBy', $this->app->user->account) + ->setDefault('lastEditedDate', $now) + ->remove('comment') + ->get(); + + $this->dao->update(TABLE_TASK)->data($task) ->where('id')->eq($taskID)->exec(); $actionID = $this->loadModel('action')->create('task', $taskID, 'Assigned', $this->post->comment, $this->post->assignedTo); $this->dao->insert(TABLE_HISTORY) diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php index edd22edb92..f4d842d250 100644 --- a/module/task/view/assignto.html.php +++ b/module/task/view/assignto.html.php @@ -18,6 +18,10 @@ task->assignedTo;?> + + task->left;?> + left, "class='text-3'");?> + comment;?>