* Use the function processStatus to get status of a record.

This commit is contained in:
liugang
2019-07-30 15:17:27 +08:00
parent 9174165657
commit 0ec5dadb1c
25 changed files with 44 additions and 44 deletions
+3 -2
View File
@@ -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;?>
+3 -2
View File
@@ -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>
+1 -1
View File
@@ -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>
+3 -2
View File
@@ -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'>
+3 -2
View File
@@ -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;?>
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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>
+3 -3
View File
@@ -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>
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -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');
+1 -1
View File
@@ -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');
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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>
+2 -2
View File
@@ -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'>
+3 -4
View File
@@ -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;?>
+3 -4
View File
@@ -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;?>
@@ -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;?>
+3 -4
View File
@@ -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>
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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;?>
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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>