From ca4710fa99ab27127bbe9865b134a4b8134ed16c Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Mon, 11 Apr 2016 17:36:30 +0800
Subject: [PATCH] * fix bug #820.

---
 module/testtask/control.php             | 16 +++++++--------
 module/testtask/view/groupcase.html.php | 27 ++++++++++++-------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 1b46b3ab62..ec8be4d5be 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -372,14 +372,14 @@ class testtask extends control
         $this->view->position[] = $this->lang->testtask->common;
         $this->view->position[] = $this->lang->testtask->cases;
 
-        $this->view->users         = $this->loadModel('user')->getPairs('noletter');
-        $this->view->productID     = $productID;
-        $this->view->task          = $task;
-        $this->view->taskID        = $taskID;
-        $this->view->browseType    = 'group';
-        $this->view->groupBy       = $groupBy;
-        $this->view->groupByList   = $groupByList;
-        $this->view->cases         = $groupCases;
+        $this->view->users       = $this->loadModel('user')->getPairs('noletter');
+        $this->view->productID   = $productID;
+        $this->view->task        = $task;
+        $this->view->taskID      = $taskID;
+        $this->view->browseType  = 'group';
+        $this->view->groupBy     = $groupBy;
+        $this->view->groupByList = $groupByList;
+        $this->view->cases       = $groupCases;
         $this->display();
     }
 
diff --git a/module/testtask/view/groupcase.html.php b/module/testtask/view/groupcase.html.php
index 373c29dc82..dd12a86ba9 100644
--- a/module/testtask/view/groupcase.html.php
+++ b/module/testtask/view/groupcase.html.php
@@ -30,27 +30,26 @@
     </tr>
   </thead>
   <?php $i = 0;?>
-  <?php foreach($cases as $groupKey => $groupTasks):?>
+  <?php foreach($cases as $groupKey => $groupCases):?>
   <?php $groupClass = ($i % 2 == 0) ? 'even' : 'highlight-warning'; $i ++;?>
   <tr id='node-<?php echo $groupKey;?>' class='actie-disabled group-title'>
     <td class='text-right <?php echo $groupClass;?> text-left large strong group-name'><?php echo $groupKey;?></td>
     <td colspan='9' class='text-left'><?php if($groupByList) echo $groupByList[$groupKey];?></td>
   </tr>
-  <?php foreach($groupTasks as $case):?>
-  <?php $caseLink = $this->createLink('case','view',"caseID=$case->id"); ?>
-  <tr id='<?php echo $case->id;?>' class='a-center child-of-node-<?php echo $groupKey;?>'>
+  <?php foreach($groupCases as $run):?>
+  <tr id='<?php echo $run->id;?>' class='a-center child-of-node-<?php echo $groupKey;?>'>
     <td class='<?php echo $groupClass;?>'></td>
-    <td class='text-left'>&nbsp;<?php echo $case->id . $lang->colon; if(!common::printLink('testcase', 'view', "case=$case->id", $case->title)) echo $case->title;?></td>
-    <td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?></span></td>
-    <td><?php echo $lang->case->typeList[$case->type];?></td>
-    <td><?php echo $users[$case->assignedTo];?></td>
-    <td><?php echo $users[$case->lastRunner];?></td>
-    <td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
-    <td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
-    <td class='<?php echo $case->status;?>'><?php echo ($case->version < $case->caseVersion) ? "<span class='warning'>{$lang->testcase->changed}</span>" : $lang->testtask->statusList[$case->status];?></td>
+    <td class='text-left'>&nbsp;<?php echo $run->case . $lang->colon; if(!common::printLink('testcase', 'view', "case=$run->case", $run->title)) echo $run->title;?></td>
+    <td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $run->pri, $run->pri)?>'><?php echo zget($lang->testcase->priList, $run->pri, $run->pri);?></span></td>
+    <td><?php echo $lang->testcase->typeList[$run->type];?></td>
+    <td><?php echo $users[$run->assignedTo];?></td>
+    <td><?php echo $users[$run->lastRunner];?></td>
+    <td><?php if(!helper::isZeroDate($run->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($run->lastRunDate));?></td>
+    <td class='<?php echo $run->lastRunResult;?>'><?php if($run->lastRunResult) echo $lang->testcase->resultList[$run->lastRunResult];?></td>
+    <td class='<?php echo $run->status;?>'><?php echo ($run->version < $run->caseVersion) ? "<span class='warning'>{$lang->testcase->changed}</span>" : $lang->testtask->statusList[$run->status];?></td>
     <td>
-      <?php common::printIcon('testcase', 'edit', "caseID=$case->id", '', 'list');?>
-      <?php common::printIcon('testcase', 'delete', "caseID=$case->id", '', 'list', '', 'hiddenwin');?>
+      <?php common::printIcon('testcase', 'edit', "caseID=$run->case", '', 'list');?>
+      <?php common::printIcon('testcase', 'delete', "caseID=$run->case", '', 'list', '', 'hiddenwin');?>
     </td>
   </tr>
   <?php endforeach;?>