From 224923e8221594471d3f734a1bd8d25051685ecb Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Wed, 22 Mar 2017 10:15:41 +0800
Subject: [PATCH 1/2]  * adjust checkDelayBugs method.

---
 module/bug/model.php          | 18 ++++++++++++++----
 module/bug/view/view.html.php |  8 ++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index d4abd354f0..42b9bda6f6 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -260,12 +260,20 @@ class bugModel extends model
     public function checkDelayBugs($bugs)
     {
         foreach ($bugs as $bug)
-        {    
+        {
             // Delayed or not?.
-            if($bug->status == 'active' && $bug->deadline != '0000-00-00')
+            if($bug->deadline != '0000-00-00')
             {
-                $delay = helper::diffDate(helper::today(), $bug->deadline);
-                if($delay > 0) $bug->delay = $delay;
+                if(substr($bug->resolvedDate, 0, 10) != '0000-00-00')
+                {
+                    $delay = helper::diffDate(substr($bug->resolvedDate, 0, 10), $bug->deadline);
+                }
+                elseif($bug->status == 'active')
+                {
+                    $delay = helper::diffDate(helper::today(), $bug->deadline);
+                }
+
+                if(isset($delay) and $delay > 0) $bug->delay = $delay;
             }
         }
 
@@ -2229,6 +2237,7 @@ class bugModel extends model
             if($id == 'status') $class .= ' bug-' . $bug->status;
             if($id == 'title') $class .= ' text-left';
             if($id == 'assignedTo' && $bug->assignedTo == $account) $class .= ' red';
+            if($id == 'deadline' && isset($bug->delay)) $class .= ' delayed';
 
             echo "<td class='" . $class . "'" . ($id=='title' ? " title='{$bug->title}'" : '') . ">";
             switch ($id)
@@ -2282,6 +2291,7 @@ class bugModel extends model
                 break;
             case 'deadline':
                 echo $bug->deadline;
+                break;
             case 'resolvedBy':
                 echo zget($users, $bug->resolvedBy, $bug->resolvedBy);
                 break;
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 5d29a4b0ec..cf2db08a5d 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -176,6 +176,10 @@
                 <th><?php echo $lang->bug->lblAssignedTo;?></th>
                 <td><?php if($bug->assignedTo) echo $users[$bug->assignedTo] . $lang->at . $bug->assignedDate;?></td>
               </tr>
+              <tr>
+                <th><?php echo $lang->bug->deadline;?></th>
+                <td><?php if($bug->deadline) echo  $bug->deadline;?></td>
+              </tr>
               <tr>
                 <th><?php echo $lang->bug->os;?></th>
                 <td><?php echo $lang->bug->osList[$bug->os];?></td>
@@ -250,10 +254,6 @@
                   ?>
                 </td>
               </tr>
-              <tr>
-                <th><?php echo $lang->bug->deadline;?></th>
-                <td><?php if($bug->deadline) echo  $bug->deadline;?></td>
-              </tr>
               <tr>
                 <th><?php echo $lang->bug->lblResolved;?></th>
                 <td><?php if($bug->resolvedBy) echo $users[$bug->resolvedBy] . $lang->at . $bug->resolvedDate;?></td>

From 6b2aa9a7cbf80f265e8e3bb10683a1eccdfcebce Mon Sep 17 00:00:00 2001
From: pengjiangxiu <pengjiangxiu@cnezsoft.com>
Date: Wed, 22 Mar 2017 10:47:15 +0800
Subject: [PATCH 2/2] * adjust linkCase.

---
 module/testtask/control.php |  2 +-
 module/testtask/model.php   | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 66387a6174..f910b1f869 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -653,7 +653,7 @@ class testtask extends control
     {
         if(!empty($_POST))
         {
-            $this->testtask->linkCase($taskID);
+            $this->testtask->linkCase($taskID, $type);
             $this->locate(inlink('cases', "taskID=$taskID"));
         }
 
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 08a559b762..3257b36689 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -582,11 +582,12 @@ class testtaskModel extends model
     /**
      * Link cases.
      * 
-     * @param  int   $taskID 
+     * @param  int    $taskID 
+     * @param  string $type
      * @access public
      * @return void
      */
-    public function linkCase($taskID)
+    public function linkCase($taskID, $type)
     {
         if($this->post->cases == false) return;
         $postData = fixer::input('post')->get();
@@ -598,6 +599,13 @@ class testtaskModel extends model
             $row->version    = $postData->versions[$caseID];
             $row->assignedTo = '';
             $row->status     = 'wait';
+
+            if($type == 'bybuild')
+            {
+                $assignedTo = $this->dao->select('assignedTo')->from(TABLE_TESTRUN)->where('`case`')->eq($caseID)->fetch();
+                $row->assignedTo = $assignedTo->assignedTo;
+            }
+
             $this->dao->replace(TABLE_TESTRUN)->data($row)->exec();
         }
     }