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

---
 module/block/view/bugblock.html.php             | 5 +++--
 module/block/view/caseblock.html.php            | 5 +++--
 module/block/view/projectblock.html.php         | 2 +-
 module/block/view/storyblock.html.php           | 5 +++--
 module/block/view/taskblock.html.php            | 5 +++--
 module/build/view/linkbug.html.php              | 2 +-
 module/build/view/linkstory.html.php            | 2 +-
 module/build/view/view.html.php                 | 6 +++---
 module/my/view/project.html.php                 | 2 +-
 module/my/view/story.html.php                   | 2 +-
 module/my/view/task.html.php                    | 2 +-
 module/my/view/testcase.html.php                | 2 +-
 module/my/view/testtask.html.php                | 2 +-
 module/productplan/view/linkbug.html.php        | 2 +-
 module/productplan/view/linkstory.html.php      | 2 +-
 module/productplan/view/view.html.php           | 4 ++--
 module/testreport/view/blockbugs.html.php       | 7 +++----
 module/testreport/view/blockcases.html.php      | 7 +++----
 module/testreport/view/blocklegacybugs.html.php | 7 +++----
 module/testreport/view/blockstories.html.php    | 7 +++----
 module/user/view/project.html.php               | 2 +-
 module/user/view/story.html.php                 | 2 +-
 module/user/view/task.html.php                  | 2 +-
 module/user/view/testcase.html.php              | 2 +-
 module/user/view/testtask.html.php              | 2 +-
 25 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php
index 1387503158..20889d37d0 100644
--- a/module/block/view/bugblock.html.php
+++ b/module/block/view/bugblock.html.php
@@ -64,8 +64,9 @@
         <td class='c-pri'><span class='label-pri label-pri-<?php echo $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
         <?php endif;?>
         <td class='c-name' style='color: <?php echo $bug->color?>' title='<?php echo $bug->title?>'><?php echo $bug->title?></td>
-        <td class='c-status' title='<?php echo zget($lang->bug->statusList, $bug->status)?>'>
-          <span class="status-bug status-<?php echo $bug->status?>"><?php echo zget($lang->bug->statusList, $bug->status);?></span>
+        <?php $status = $this->processStatus('bug', $bug);?>
+        <td class='c-status' title='<?php echo $status;?>'>
+          <span class="status-bug status-<?php echo $bug->status?>"><?php echo $status;?></span>
         </td>
       </tr>
       <?php endforeach;?>
diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php
index 5b00e0ce94..cf9299d997 100644
--- a/module/block/view/caseblock.html.php
+++ b/module/block/view/caseblock.html.php
@@ -53,9 +53,10 @@
         <td class='c-runtime'><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
         <td class='c-result'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
         <?php endif;?>
-        <td class='c-status' title='<?php echo zget($lang->testcase->statusList, $case->status)?>'>
+        <?php $status = $this->processStatus('testcase', $case);?>
+        <td class='c-status' title='<?php echo $status;?>'>
           <span class="case-status-<?php echo $case->status?>">
-            <span class='status-text'><?php echo zget($lang->testcase->statusList, $case->status);?></span>
+            <span class='status-text'><?php echo $status;?></span>
           </span>
         </td>
       </tr>
diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php
index 4637747c69..15da1f159d 100644
--- a/module/block/view/projectblock.html.php
+++ b/module/block/view/projectblock.html.php
@@ -47,7 +47,7 @@
           <?php if(isset($project->delay)):?>
           <span class="status-project status-delayed" title='<?php echo $lang->project->delayed;?>'><?php echo $lang->project->delayed;?></span>
           <?php else:?>
-          <?php $statusName = zget($lang->project->statusList, $project->status, '');?>
+          <?php $statusName = $this->processStatus('project', $project);?>
           <span class="status-project status-<?php echo $project->status?>" title='<?php echo $statusName;?>'><?php echo $statusName;?></span>
           <?php endif;?>
         </td>
diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php
index a2ed50f198..2b6b29c32d 100644
--- a/module/block/view/storyblock.html.php
+++ b/module/block/view/storyblock.html.php
@@ -56,8 +56,9 @@
         <?php if($longBlock):?>
         <td class='c-estimate text-center'><?php echo $story->estimate?></td>
         <?php endif;?>
-        <td class='c-status' title='<?php echo zget($lang->story->statusList, $story->status);?>'>
-          <span class="status-story status-<?php echo $story->status?>"><?php echo zget($lang->story->statusList, $story->status);?></span>
+        <?php $status = $this->processStatus('story', $story);?>
+        <td class='c-status' title='<?php echo $status;?>'>
+          <span class="status-story status-<?php echo $story->status?>"><?php echo $status;?></span>
         </td>
         <?php if($longBlock):?>
         <td class='c-stage'>
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php
index 5c251bce02..f8d1725938 100644
--- a/module/block/view/taskblock.html.php
+++ b/module/block/view/taskblock.html.php
@@ -49,8 +49,9 @@
         <td class='c-estimate text-center'><?php echo $task->estimate?></td>
         <td class='c-deadline'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
         <?php endif;?>
-        <td class='c-status' title='<?php echo zget($lang->task->statusList, $task->status)?>'>
-          <span class="status-task status-<?php echo $task->status?>"><?php echo zget($lang->task->statusList, $task->status);?></span>
+        <?php $status = $this->processStatus('task', $task);?>
+        <td class='c-status' title='<?php echo $status;?>'>
+          <span class="status-task status-<?php echo $task->status?>"><?php echo $status;?></span>
         </td>
       </tr>
       <?php endforeach;?>
diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php
index 0087447d23..fda90de279 100644
--- a/module/build/view/linkbug.html.php
+++ b/module/build/view/linkbug.html.php
@@ -49,7 +49,7 @@
           <td style='overflow:visible;padding-top:1px;padding-bottom:1px;'><?php echo ($bug->status == 'resolved' or $bug->status == 'closed') ? $users[$bug->resolvedBy] : html::select("resolvedBy[{$bug->id}]", $users, $this->app->user->account, "class='form-control chosen'");?></td>
           <td>
             <span class='status-bug status-<?php echo $bug->status?>'>
-              <?php echo $lang->bug->statusList[$bug->status];?>
+              <?php echo $this->processStatus('bug', $bug);?>
             </span>
           </td>
         </tr>
diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php
index f3029edfa7..308efa3590 100644
--- a/module/build/view/linkstory.html.php
+++ b/module/build/view/linkstory.html.php
@@ -52,7 +52,7 @@
           <td><?php echo $story->estimate;?></td>
           <td>
             <span class='status-story status-<?php echo $story->status?>'>
-              <?php echo $lang->story->statusList[$story->status];?>
+              <?php echo $this->processStatus('story', $story);?>
             </span>
           </td>
           <td><?php echo $lang->story->stageList[$story->stage];?></td>
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index aece44133f..cd883be5ff 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -135,7 +135,7 @@ tbody tr td:first-child input{display:none;}
                 <td><?php echo $story->estimate;?></td>
                 <td>
                   <span class='status-story status-<?php echo $story->status;?>'>
-                    <?php echo $lang->story->statusList[$story->status];?>
+                    <?php echo $this->processStatus('story', $story);?>
                   </span>
                 </td>
                 <td><?php echo $lang->story->stageList[$story->stage];?></td>
@@ -206,7 +206,7 @@ tbody tr td:first-child input{display:none;}
                 <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='iframe' data-width='1000'");?></td>
                 <td>
                   <span class='status-bug status-<?php echo $bug->status?>'>
-                    <?php echo $lang->bug->statusList[$bug->status];?>
+                    <?php echo $this->processStatus('bug', $bug);?>
                   </span>
                 </td>
                 <td><?php echo $users[$bug->openedBy];?></td>
@@ -281,7 +281,7 @@ tbody tr td:first-child input{display:none;}
                 <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='iframe' data-width='1000'");?></td>
                 <td>
                   <span class='status-bug status-<?php echo $bug->status?>'>
-                    <?php echo $lang->bug->statusList[$bug->status];?>
+                    <?php echo $this->processStatus('bug', $bug);?>
                   </span>
                 </td>
                 <td><?php echo $users[$bug->openedBy];?></td>
diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php
index b28fe3ad2b..ec23502481 100644
--- a/module/my/view/project.html.php
+++ b/module/my/view/project.html.php
@@ -57,7 +57,7 @@
           <?php if(isset($project->delay)):?>
           <span class="status-project status-delayed" title='<?php echo $lang->project->delayed;?>'> <?php echo $lang->project->delayed;?></span>
           <?php else:?>
-          <?php $statusName = zget($lang->project->statusList, $project->status, '');?>
+          <?php $statusName = $this->processStatus('project', $project);?>
           <span class="status-project status-<?php echo $project->status?>" title='<?php echo $statusName;?>'> <?php echo $statusName;?></span>
           <?php endif;?>
         </td>
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index b010211ae6..63c4ee9d4c 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -75,7 +75,7 @@
           <td class='c-plan'><?php echo $story->planTitle;?></td>
           <td class='c-user'><?php echo $users[$story->openedBy];?></td>
           <td class='c-hours'><?php echo $story->estimate;?></td>
-          <td class='c-status'><span class='status-story status-<?php echo $story->status;?>'> <?php echo zget($lang->story->statusList, $story->status);?></span></td>
+          <td class='c-status'><span class='status-story status-<?php echo $story->status;?>'> <?php echo $this->processStatus('story', $story);?></span></td>
           <td class='c-stage'><?php echo zget($lang->story->stageList, $story->stage);?></td>
           <td class='c-actions'>
             <?php
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 6209075b73..b6d0315273 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -84,7 +84,7 @@
           <td class='c-hours'><?php echo $task->consumed;?></td>
           <td class='c-hours'><?php echo $task->left;?></td>
           <td class='c-date <?php if(isset($task->delay)) echo 'text-red';?>'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
-          <td class='c-status'><span class="status-task status-<?php echo $task->status;?>"><?php echo $lang->task->statusList[$task->status];?></span></td>
+          <td class='c-status'><span class="status-task status-<?php echo $task->status;?>"><?php echo $this->processStatus('task', $task);?></span></td>
           <td class='c-actions'>
             <?php
             if($task->needConfirm)
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index d46011c14f..a00fecaad3 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -87,7 +87,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='<?php if(isset($run)) echo $run->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
+          <td class='<?php if(isset($run)) echo $run->status;?>'><?php echo $this->processStatus('testcase', $case);?></td>
           <td class='c-actions'>
             <?php
             common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug');
diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php
index 60c97e9458..fdfc9bb5bb 100644
--- a/module/my/view/testtask.html.php
+++ b/module/my/view/testtask.html.php
@@ -55,7 +55,7 @@
         <td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
         <td><?php echo $task->begin?></td>
         <td><?php echo $task->end?></td>
-        <td class='status-testtask status-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
+        <td class='status-testtask status-<?php echo $task->status?>'><?php echo $this->processStatus('testtask', $task);?></td>
         <td class='c-actions'>
           <?php
           common::printIcon('testtask',   'cases',    "taskID=$task->id", $task, 'list', 'sitemap');
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index 62d713de1f..0b4600f80a 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -48,7 +48,7 @@
           <td><?php echo $users[$bug->assignedTo];?></td>
           <td>
             <span class='status-bug status-<?php echo $bug->status?>'>
-              <?php echo $lang->bug->statusList[$bug->status];?>
+              <?php echo $this->processStatus('bug', $bug);?>
             </span>
           </td>
         </tr>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index 178517f9a5..70fe264d28 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -55,7 +55,7 @@
           <td><?php echo $story->estimate;?></td>
           <td>
             <span class='status-story status-<?php echo $story->status?>'>
-              <?php echo $lang->story->statusList[$story->status];?>
+              <?php echo $this->processStatus('story', $story);?>
             </span>
           </td>
           <td class='text-center'><?php echo $lang->story->stageList[$story->stage];?></td>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index d63c1ab99c..8bc2effef1 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -151,7 +151,7 @@
                 <td><?php echo $story->estimate;?></td>
                 <td>
                   <span class='status-story status-<?php echo $story->status?>'>
-                    <?php echo $lang->story->statusList[$story->status];?>
+                    <?php echo $this->processStatus('story', $story);?>
                   </span>
                 </td>
                 <td><?php echo $lang->story->stageList[$story->stage];?></td>
@@ -386,7 +386,7 @@
                 <td><?php echo zget($users, $bug->assignedTo);?></td>
                 <td>
                   <span class='status-bug status-<?php echo $bug->status?>'>
-                    <?php echo $lang->bug->statusList[$bug->status];?>
+                    <?php echo $this->processStatus('bug', $bug);?>
                   </span>
                 </td>
                 <td class='c-actions'>
diff --git a/module/testreport/view/blockbugs.html.php b/module/testreport/view/blockbugs.html.php
index 9c62ed4e4e..660512aab3 100644
--- a/module/testreport/view/blockbugs.html.php
+++ b/module/testreport/view/blockbugs.html.php
@@ -21,10 +21,9 @@
       <td><?php echo zget($users, $bug->openedBy);?></td>
       <td><?php echo zget($users, $bug->resolvedBy);?></td>
       <td><?php if($bug->resolvedDate != '0000-00-00 00:00:00') echo substr($bug->resolvedDate, 2);?></td>
-      <td title='<?php echo zget($lang->bug->statusList, $bug->status);?>'>
-        <span class="status-bug status-<?php echo $bug->status?>">
-          <?php echo zget($lang->bug->statusList, $bug->status);?>
-        </span>
+      <?php $status = $this->processStatus('bug', $bug);?>
+      <td title='<?php echo $status;?>'>
+        <span class="status-bug status-<?php echo $bug->status?>"><?php echo $status;?></span>
       </td>
     </tr>
     <?php endforeach;?>
diff --git a/module/testreport/view/blockcases.html.php b/module/testreport/view/blockcases.html.php
index badbdbcef8..903969ba75 100644
--- a/module/testreport/view/blockcases.html.php
+++ b/module/testreport/view/blockcases.html.php
@@ -25,10 +25,9 @@
       <td><?php echo zget($users, $case->lastRunner);?></td>
       <td><?php echo substr($case->lastRunDate, 2);?></td>
       <td><?php echo zget($lang->testcase->resultList, $case->lastRunResult);?></td>
-      <td title='<?php echo zget($lang->testtask->statusList, $case->status);?>'>
-        <span class="status-case status-<?php echo $case->status?>">
-          <?php echo zget($lang->testtask->statusList, $case->status);?>
-        </span>
+      <?php $status = $this->processStatus('testcase', $case);?>
+      <td title='<?php echo $status;?>'>
+        <span class="status-case status-<?php echo $case->status?>"><?php echo $status;?></span>
       </td>
     </tr>
     <?php endforeach;?>
diff --git a/module/testreport/view/blocklegacybugs.html.php b/module/testreport/view/blocklegacybugs.html.php
index c0711ad01d..23336cb649 100644
--- a/module/testreport/view/blocklegacybugs.html.php
+++ b/module/testreport/view/blocklegacybugs.html.php
@@ -21,10 +21,9 @@
       <td><?php echo zget($users, $bug->openedBy);?></td>
       <td><?php echo zget($users, $bug->resolvedBy);?></td>
       <td><?php if($bug->resolvedDate != '0000-00-00 00:00:00') echo substr($bug->resolvedDate, 2);?></td>
-      <td title='<?php echo zget($lang->bug->statusList, $bug->status);?>'>
-        <span class="status-bug status-<?php echo $bug->status?>">
-          <?php echo zget($lang->bug->statusList, $bug->status);?>
-        </span>
+      <?php $status = $this->processStatus('bug', $bug);?>
+      <td title='<?php echo $status;?>'>
+        <span class="status-bug status-<?php echo $bug->status?>"><?php echo $status;?></span>
       </td>
     </tr>
     <?php endforeach;?>
diff --git a/module/testreport/view/blockstories.html.php b/module/testreport/view/blockstories.html.php
index 4f9fb5bb85..f492e49d96 100644
--- a/module/testreport/view/blockstories.html.php
+++ b/module/testreport/view/blockstories.html.php
@@ -22,10 +22,9 @@
       <td><?php echo zget($users, $story->openedBy);?></td>
       <td><?php echo zget($users, $story->assignedTo);?></td>
       <td><?php echo $story->estimate?></td>
-      <td title='<?php echo zget($lang->story->statusList, $story->status);?>'>
-        <span class="status-story status-<?php echo $story->status?>">
-          <?php echo zget($lang->story->statusList, $story->status);?>
-        </span>
+      <?php $status = $this->processStatus('story', $story);?>
+      <td title='<?php echo $status;?>'>
+        <span class="status-story status-<?php echo $story->status?>"><?php echo $status;?></span>
       </td>
       <td><?php echo zget($lang->story->stageList, $story->stage);?></td>
     </tr>
diff --git a/module/user/view/project.html.php b/module/user/view/project.html.php
index 18dd1a5340..966d334ef7 100644
--- a/module/user/view/project.html.php
+++ b/module/user/view/project.html.php
@@ -41,7 +41,7 @@
           <?php if(isset($project->delay)):?>
           <td class='project-delay'><?php echo $lang->project->delayed;?></td>
           <?php else:?>
-          <td class='project-<?php echo $project->status?>'><?php echo $lang->project->statusList[$project->status];?></td>
+          <td class='project-<?php echo $project->status?>'><?php echo $this->processStatus('project', $project);?></td>
           <?php endif;?>
           <td><?php echo $project->role;?></td>
           <td><?php echo $project->join;?></td>
diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php
index 33793847fd..213a0f2737 100644
--- a/module/user/view/story.html.php
+++ b/module/user/view/story.html.php
@@ -59,7 +59,7 @@
           <td title='<?php echo $story->planTitle;?>'><?php echo $story->planTitle;?></td>
           <td><?php echo zget($users, $story->openedBy);?></td>
           <td><?php echo $story->estimate;?></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 $lang->story->stageList[$story->stage];?></td>
         </tr>
         <?php endforeach;?>
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index 9bcf9deac0..b4fa0b3e95 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -66,7 +66,7 @@
           <td><?php echo $task->consumed;?></td>
           <td><?php echo $task->left;?></td>
           <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
-          <td class='<?php echo $task->status;?>'><?php echo $lang->task->statusList[$task->status];?></td>
+          <td class='<?php echo $task->status;?>'><?php echo $this->processStatus('task', $task);?></td>
         </tr>
         <?php endforeach;?>
       </tbody>
diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php
index 2ebfd865cc..8932530a56 100755
--- a/module/user/view/testcase.html.php
+++ b/module/user/view/testcase.html.php
@@ -58,7 +58,7 @@
           <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 $lang->testcase->statusList[$case->status];?></td>
+          <td class='<?php echo $case->status;?>'><?php echo $this->processStatus('testcase', $case);?></td>
         </tr>
         <?php endforeach;?>
       </tbody> 
diff --git a/module/user/view/testtask.html.php b/module/user/view/testtask.html.php
index 640fb09702..18226f521e 100755
--- a/module/user/view/testtask.html.php
+++ b/module/user/view/testtask.html.php
@@ -47,7 +47,7 @@
           <td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
           <td><?php echo $task->begin?></td>
           <td><?php echo $task->end?></td>
-          <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>
         <?php endforeach;?>
       </tbody>