From 2bf5424cb07772198db4bc402aeac823a41c760f Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Tue, 30 Jul 2019 11:09:44 +0800
Subject: [PATCH] * Use function processStatus to get status of a record.

---
 module/story/view/affected.html.php   | 12 +++---------
 module/story/view/batchclose.html.php |  2 +-
 module/story/view/batchedit.html.php  |  2 +-
 module/story/view/bugs.html.php       | 16 ++++++++--------
 module/story/view/cases.html.php      |  2 +-
 module/story/view/edit.html.php       |  2 +-
 module/story/view/linkstory.html.php  |  2 +-
 module/story/view/tasks.html.php      |  2 +-
 module/story/view/view.html.php       |  2 +-
 module/story/view/zerocase.html.php   |  2 +-
 10 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/module/story/view/affected.html.php b/module/story/view/affected.html.php
index ac2bfffd4a..e435960383 100644
--- a/module/story/view/affected.html.php
+++ b/module/story/view/affected.html.php
@@ -27,9 +27,7 @@
                 <td class='text-left'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name, '_blank');?></td>
                 <td><?php echo $users[$task->assignedTo];?></td>
                 <td>
-                  <span class='status-task status-<?php echo $task->status?>'>
-                    <?php echo $lang->task->statusList[$task->status];?>
-                  </span>
+                  <span class='status-task status-<?php echo $task->status?>'><?php echo $this->processStatus('task', $task);?></span>
                 </td>
                 <td><?php echo $task->consumed;?></td>
                 <td><?php echo $task->left;?></td>
@@ -59,9 +57,7 @@
             <td><?php echo $bug->id;?></td>
             <td class='text-left'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '_blank');?></td>
             <td>
-              <span class='status-bug status-<?php echo $bug->status?>'>
-                <?php echo $lang->bug->statusList[$bug->status];?>
-              </span>
+              <span class='status-bug status-<?php echo $bug->status?>'><?php echo $this->processStatus('bug', $bug);?></span>
             </td>
             <td><?php echo $users[$bug->openedBy];?></td>
             <td><?php echo $users[$bug->resolvedBy];?></td>
@@ -89,9 +85,7 @@
             <td><?php echo $case->id;?></td>
             <td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "caseID=$case->id"), $case->title, '_blank');?></td>
             <td>
-              <span class='status-case status-<?php echo $case->status?>'>
-                <?php echo $lang->testcase->statusList[$case->status];?>
-              </span>
+              <span class='status-case status-<?php echo $case->status?>'><?php echo $this->processStatus('testcase', $case);?></span>
             </td>
             <td><?php echo $users[$case->openedBy];?></td>
             <td><?php echo $users[$case->lastEditedBy];?></td>
diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php
index 830428c0ea..fe1e78cbcb 100755
--- a/module/story/view/batchclose.html.php
+++ b/module/story/view/batchclose.html.php
@@ -33,7 +33,7 @@
       <tr class='text-center'>
         <td><?php echo $storyID . html::hidden("storyIDList[$storyID]", $storyID);?></td>
         <td class='text-left'><?php echo $story->title;?></td>
-        <td class='story-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
+        <td class='story-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></td>
         <td>
           <?php if($story->status == 'draft') unset($this->lang->story->reasonList['cancel']);?>
           <table class='w-p100'>
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php
index 23ea9e8ec1..fbfe7739f5 100644
--- a/module/story/view/batchedit.html.php
+++ b/module/story/view/batchedit.html.php
@@ -119,7 +119,7 @@ foreach(explode(',', $showFields) as $field)
           <td <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$storyID]",     $priList, $story->pri, 'class=form-control');?></td>
           <td class='text-left<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>'><?php echo html::select("assignedTo[$storyID]",     $users, $story->assignedTo, "class='form-control chosen'");?></td>
           <td <?php echo zget($visibleFields, 'source', "class='hidden'")?>><?php echo html::select("sources[$storyID]",  $sourceList, $story->source, 'class=form-control');?></td>
-          <td class='story-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
+          <td class='story-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></td>
           <td <?php echo zget($visibleFields, 'stage', "class='hidden'")?>><?php echo html::select("stages[$storyID]", $stageList, $story->stage, 'class="form-control"' . ($story->status == 'draft' ? ' disabled="disabled"' : ''));?></td>
           <td class='text-left<?php echo zget($visibleFields, 'closedBy', ' hidden')?>'><?php echo html::select("closedBys[$storyID]",     $users, $story->closedBy, "class='form-control" . ($story->status == 'closed' ? " chosen'" : "' disabled='disabled'"));?></td>
 
diff --git a/module/story/view/bugs.html.php b/module/story/view/bugs.html.php
index 2ee49e27eb..191b3204b4 100644
--- a/module/story/view/bugs.html.php
+++ b/module/story/view/bugs.html.php
@@ -10,14 +10,14 @@
     <table class='table table-fixed'>
       <thead>
         <tr class='text-center'>
-          <th class='w-40px'>    <?php echo $lang->idAB;?></th>
-          <th class='w-p30'>   <?php echo $lang->bug->title;?></th>
-          <th class='w-pri'>   <?php echo $lang->priAB;?></th>
-          <th class='w-type'>  <?php echo $lang->bug->type;?></th>
+          <th class='w-40px'><?php echo $lang->idAB;?></th>
+          <th class='w-p30'> <?php echo $lang->bug->title;?></th>
+          <th class='w-pri'> <?php echo $lang->priAB;?></th>
+          <th class='w-type'><?php echo $lang->bug->type;?></th>
           <th class='w-40px'><?php echo $lang->statusAB;?></th>
-          <th class='w-user'>  <?php echo $lang->bug->assignedTo;?></th>
-          <th class='w-50px'>  <?php echo $lang->bug->resolvedBy;?></th>
-          <th class='w-50px'>  <?php echo $lang->bug->resolution;?></th>
+          <th class='w-user'><?php echo $lang->bug->assignedTo;?></th>
+          <th class='w-50px'><?php echo $lang->bug->resolvedBy;?></th>
+          <th class='w-50px'><?php echo $lang->bug->resolution;?></th>
         </tr>
       </thead>
       <tbody>
@@ -27,7 +27,7 @@
           <td class='text-left' title="<?php echo $bug->title?>"><?php echo $bug->title;?></td>
           <td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo $bug->pri == '0' ? '' : zget($lang->bug->priList, $bug->pri, $bug->pri);?></span></td>
           <td><?php echo $lang->bug->typeList[$bug->type];?></td>
-          <td><?php echo $lang->bug->statusList[$bug->status];?></td>
+          <td><?php echo $this->processStatus('bug',$bug);?></td>
           <td><?php echo zget($users, $bug->assignedTo, $bug->assignedTo);?></td>
           <td><?php echo zget($users, $bug->resolvedBy, $bug->resolvedBy);?></td>
           <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
diff --git a/module/story/view/cases.html.php b/module/story/view/cases.html.php
index 587304e73b..0eab738ec6 100644
--- a/module/story/view/cases.html.php
+++ b/module/story/view/cases.html.php
@@ -27,7 +27,7 @@
           <td class='text-left' title="<?php echo $case->title?>"><?php echo $case->title;?></td>
           <td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo $case->pri == '0' ? '' : zget($lang->case->priList, $case->pri, $case->pri);?></span></td>
           <td><?php echo $lang->testcase->typeList[$case->type];?></td>
-          <td><?php echo $lang->testcase->statusList[$case->status];?></td>
+          <td><?php echo $this->processStatus('testcase', $case);?></td>
           <td><?php echo zget($users, $case->lastRunner, $case->lastRunner);?></td>
           <td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
           <td><?php echo $case->lastRunResult ? $lang->testcase->resultList[$case->lastRunResult] : '';?></td>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 3fb5903ee9..019515db8b 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -123,7 +123,7 @@
               </tr>
               <tr>
                 <th><?php echo $lang->story->status;?></th>
-                <td><span class='story-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></span></td>
+                <td><span class='story-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span></td>
               </tr>
               <?php if($story->status != 'draft'):?>
               <tr>
diff --git a/module/story/view/linkstory.html.php b/module/story/view/linkstory.html.php
index e25a41dd4a..799b6e8c6f 100644
--- a/module/story/view/linkstory.html.php
+++ b/module/story/view/linkstory.html.php
@@ -61,7 +61,7 @@
         <td><?php echo html::a($this->createLink('product', 'browse', "productID=$story2Link->product&branch=$story2Link->branch"), $products[$story2Link->product], '_blank');?></td>
         <td class='text-left nobr' title="<?php echo $story2Link->title?>"><?php echo html::a($storyLink, $story2Link->title, '_blank');?></td>
         <td><?php echo $story2Link->planTitle;?></td>
-        <td><?php echo zget($lang->story->statusList, $story2Link->status);?></td>
+        <td><?php echo $this->processStatus('story', $story2Link);?></td>
         <td><?php echo zget($lang->story->stageList, $story2Link->stage);?></td>
         <td><?php echo zget($users, $story2Link->openedBy);?></td>
         <td><?php echo $story2Link->estimate;?></td>
diff --git a/module/story/view/tasks.html.php b/module/story/view/tasks.html.php
index bf6632eac2..08ba9c6051 100644
--- a/module/story/view/tasks.html.php
+++ b/module/story/view/tasks.html.php
@@ -30,7 +30,7 @@ include '../../common/view/chart.html.php';
           <td><?php echo $task->id;?></td>
           <td class='text-left' title="<?php echo $task->name?>"><?php echo $task->name;?></td>
           <td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
-          <td><?php echo $lang->task->statusList[$task->status];?></td>
+          <td><?php echo $this->processStatus('task', $task);?></td>
           <td><?php echo zget($users, $task->assignedTo, $task->assignedTo);?></td>
           <td><?php echo $task->estimate;?></td>
           <td><?php echo $task->consumed;?></td>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index aa10740f5f..b2e5f9fbb6 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -195,7 +195,7 @@
                 </tr>
                 <tr>
                   <th><?php echo $lang->story->status;?></th>
-                  <td><span class='status-story status-<?php echo $story->status?>'><span class="label label-dot"></span> <?php echo $lang->story->statusList[$story->status];?></span></td>
+                  <td><span class='status-story status-<?php echo $story->status?>'><span class="label label-dot"></span> <?php echo $this->processStatus('story', $story);?></span></td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->story->stage;?></th>
diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php
index 8039ed1cb5..834f25efdb 100644
--- a/module/story/view/zerocase.html.php
+++ b/module/story/view/zerocase.html.php
@@ -63,7 +63,7 @@
         <td><?php echo $users[$story->openedBy];?></td>
         <td><?php echo $users[$story->assignedTo];?></td>
         <td><?php echo $story->estimate;?></td>
-        <td><span class='status-story status-<?php echo $story->status;?>'><?php echo zget($lang->story->statusList, $story->status);?></span></td>
+        <td><span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span></td>
         <td><?php echo zget($lang->story->stageList, $story->stage);?></td>
         <td class='c-actions'>
           <?php