From bd0beda0b003643fe7bb55d5d32f62173336dde7 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Thu, 18 Mar 2010 03:26:59 +0000
Subject: [PATCH]  * adjust the logic when edit a task.

---
 trunk/module/common/lang/zh-cn.php | 1 +
 trunk/module/task/model.php        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/trunk/module/common/lang/zh-cn.php b/trunk/module/common/lang/zh-cn.php
index 596014defa..56fe0c48e6 100644
--- a/trunk/module/common/lang/zh-cn.php
+++ b/trunk/module/common/lang/zh-cn.php
@@ -175,6 +175,7 @@ $lang->error->length          = array("『%s』长度错误，应当为『%s』"
 $lang->error->reg             = "『%s』不符合格式，应当为:『%s』。";
 $lang->error->unique          = "『%s』已经有『%s』这条记录了。";
 $lang->error->notempty        = "『%s』不能为空。";
+$lang->error->equal           = "『%s』必须为『%s』。";
 $lang->error->int             = array("『%s』应当是数字。", "『%s』应当介于『%s-%s』之间。");
 $lang->error->float           = "『%s』应当是数字，可以是小数。";
 $lang->error->email           = "『%s』应当为合法的EMAIL。";
diff --git a/trunk/module/task/model.php b/trunk/module/task/model.php
index 6cc6eaf431..70f52924f1 100644
--- a/trunk/module/task/model.php
+++ b/trunk/module/task/model.php
@@ -69,7 +69,6 @@ class taskModel extends model
             ->setDefault('story, estimate, left, consumed', 0)
             ->setIF($this->post->story != false and $this->post->story != $oldTask->story, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story))
             ->setIF($this->post->status == 'done', 'left', 0)
-            ->setIF($this->post->left == 0, 'status', 'done')
             ->setIF($this->post->consumed > 0 and $this->post->left > 0 and $this->post->status == 'wait', 'status', 'doing')
             ->remove('comment,fiels,labels')
             ->get();
@@ -77,11 +76,12 @@ class taskModel extends model
 
         $this->dao->update(TABLE_TASK)->data($task)
             ->autoCheck()
-            ->batchCheck($this->config->task->edit->requiredFields, 'notempty')
+            ->batchCheckIF($task->status != 'cancel', $this->config->task->edit->requiredFields, 'notempty')
             ->checkIF($task->estimate != false, 'estimate', 'float')
             ->checkIF($task->left     != false, 'left',     'float')
             ->checkIF($task->consumed != false, 'consumed', 'float')
             ->checkIF($task->status == 'done', 'consumed', 'notempty')
+            ->checkIF($task->left == 0 and $task->status != 'cancel', 'status', 'equal', 'done')
             ->where('id')->eq((int)$taskID)->exec();
         if($this->post->story != false) $this->loadModel('story')->setStage($this->post->story);
         if(!dao::isError()) return common::createChanges($oldTask, $task);