From 9174165657e351d9cacaf19a3b797c731385e40a Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Tue, 30 Jul 2019 14:41:36 +0800
Subject: [PATCH] * Use the function processStatus to get status of a record.

---
 module/testtask/view/browse.html.php    | 5 +++--
 module/testtask/view/groupcase.html.php | 2 +-
 module/testtask/view/linkcase.html.php  | 2 +-
 module/testtask/view/view.html.php      | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index da627099e7..f6d11336a8 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -91,9 +91,10 @@ $status = $this->session->testTaskVersionStatus;
       <td><?php echo zget($users, $task->owner);?></td>
       <td><?php echo $task->begin?></td>
       <td><?php echo $task->end?></td>
-      <td title='<?php echo $lang->testtask->statusList[$task->status];?>'>
+      <?php $status = $this->processStatus('testtask', $task);?>
+      <td title='<?php echo $status;?>'>
         <span class='status-task status-<?php echo $task->status?>'>
-          <?php echo $lang->testtask->statusList[$task->status];?>
+          <?php echo $status;?>
         </span>
       </td>
       <td class='c-actions'>
diff --git a/module/testtask/view/groupcase.html.php b/module/testtask/view/groupcase.html.php
index 0a0eb126e0..942269a3ff 100644
--- a/module/testtask/view/groupcase.html.php
+++ b/module/testtask/view/groupcase.html.php
@@ -70,7 +70,7 @@
         <td><?php echo zget($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 class='<?php echo $run->status;?>'><?php echo ($run->version < $run->caseVersion) ? "<span class='warning'>{$lang->testcase->changed}</span>" : $this->processStatus('testtask', $run);?></td>
         <td><?php echo (common::hasPriv('testcase', 'bugs') and $run->bugs) ? html::a($this->createLink('testcase', 'bugs', "runID={$run->id}&caseID={$run->case}"), $run->bugs, '', "class='iframe'") : $run->bugs;?></td>
         <td><?php echo (common::hasPriv('testtask', 'results') and $run->results) ? html::a($this->createLink('testtask', 'results', "runID={$run->id}&caseID={$run->case}"), $run->results, '', "class='iframe'") : $run->results;?></td>
         <td><?php echo $run->stepNumber;?></td>
diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php
index 9714da2d8a..032ef7ddc4 100644
--- a/module/testtask/view/linkcase.html.php
+++ b/module/testtask/view/linkcase.html.php
@@ -117,7 +117,7 @@
         <td><?php echo zget($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='case-<?php echo $case->status?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
+        <td class='case-<?php echo $case->status?>'><?php echo $this->processStatus('testcase', $case);?></td>
       </tr>
       <?php endforeach;?>
       </tbody>
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index e69919184a..60cbcbbf49 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -118,7 +118,7 @@
             </tr>
             <tr>
               <th><?php echo $lang->testtask->status;?></th>
-              <td class='task-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
+              <td class='task-<?php echo $task->status?>'><?php echo $this->processStatus('testtask', $task);?></td>
             </tr>
           </table>
         </div>