From 30c1499d060e722058770c1b4fe4a35bcc6d0d51 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Mon, 26 Nov 2012 06:51:08 +0000
Subject: [PATCH]  * adjust judge delay.

---
 module/task/model.php | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 0214f6d7a3..5de5d1ad50 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -751,29 +751,19 @@ class taskModel extends model
         $today = helper::today();
        
         /* Delayed or not?. */
-        if($task->status !== 'done' and $task->status !== 'cancel')
+        if($task->status !== 'done' and $task->status !== 'cancel' and $task->status != 'closed')
         {
             if($task->deadline != '0000-00-00')
             {
-                if($task->status == 'closed' && $task->closedReason == 'done')
-                {
-                    if($task->finishedDate == '') $delay = helper::diffDate(substr($task->closedDate, 0, 10), $task->deadline);
-                    if($task->finishedDate != '') $delay = helper::diffDate(substr($task->finishedDate, 0, 10), $task->deadline);
-                }
-                else
-                {
-                    $delay = helper::diffDate($today, $task->deadline);
-                }
-            	if($delay > 0) $task->delay = $delay;            
+                $delay = helper::diffDate($today, $task->deadline);
+                if($delay > 0) $task->delay = $delay;            
 	        } 
 	    }
 	    
         /* Story changed or not. */
         $task->needConfirm = false;
-        if($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion)
-        {
-            $task->needConfirm = true;
-        }
+        if($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion) $task->needConfirm = true;
+
         return $task;
     }