Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Use the function zget to get users.

Browse Source
This commit is contained in:
liugang
2019-07-30 17:33:59 +08:00
parent 2a011d5d42
commit 9c53dd8e6b
34 changed files with 84 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/view/trash.html.php
+1 -1
View File
@@ -63,7 +63,7 @@
}
?>
</td>
<td><?php echo $users[$action->actor];?></td>
<td><?php echo zget($users, $action->actor);?></td>
<td><?php echo $action->date;?></td>
<td>
<?php
module/block/view/dynamic.html.php
+1 -1
View File
@@ -11,7 +11,7 @@
$i = 0;
foreach($actions as $action)
{
$user = isset($users[$action->actor]) ? $users[$action->actor] : $action->actor;
$user = zget($users, $action->actor);
if($action->action == 'login' or $action->action == 'logout' or empty($action->objectLink)) $action->objectName = $action->objectLabel = '';
$class = $action->major ? "class='active'" : '';
echo "<li $class><div>";
module/bug/view/edit.html.php
+1 -1
View File
@@ -213,7 +213,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<tbody>
<tr>
<th class='thWidth'><?php echo $lang->bug->openedBy;?></th>
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
</tr>
<tr>
<th><?php echo $lang->bug->openedBuild;?></th>
module/bug/view/view.html.php
+2 -2
View File
@@ -199,7 +199,7 @@
</tr>
<tr>
<th><?php echo $lang->bug->lblAssignedTo;?></th>
<td><?php if($bug->assignedTo) echo $users[$bug->assignedTo] . $lang->at . $bug->assignedDate;?></td>
<td><?php if($bug->assignedTo) echo zget($users, $bug->assignedTo) . $lang->at . $bug->assignedDate;?></td>
</tr>
<tr>
<th><?php echo $lang->bug->deadline;?></th>
@@ -224,7 +224,7 @@
</tr>
<tr>
<th><?php echo $lang->bug->mailto;?></th>
<td><?php $mailto = explode(',', str_replace(' ', '', $bug->mailto)); foreach($mailto as $account) echo ' ' . $users[$account]; ?></td>
<td><?php $mailto = explode(',', str_replace(' ', '', $bug->mailto)); foreach($mailto as $account) echo ' ' . zget($users, $account); ?></td>
</tr>
</tbody>
</table>
module/build/view/linkbug.html.php
+2 -2
View File
@@ -45,8 +45,8 @@
</td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
<td><?php echo $users[$bug->openedBy];?></td>
<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><?php echo zget($users, $bug->openedBy);?></td>
<td style='overflow:visible;padding-top:1px;padding-bottom:1px;'><?php echo ($bug->status == 'resolved' or $bug->status == 'closed') ? zget($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 $this->processStatus('bug', $bug);?>
module/build/view/linkstory.html.php
+2 -2
View File
@@ -47,8 +47,8 @@
</td>
<td><span class='label-pri label-pri-<?php echo $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
<td class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $users[$story->assignedTo];?></td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo zget($users, $story->assignedTo);?></td>
<td><?php echo $story->estimate;?></td>
<td>
<span class='status-story status-<?php echo $story->status?>'>
module/build/view/view.html.php
+6 -6
View File
@@ -131,7 +131,7 @@ tbody tr td:first-child input{display:none;}
</td>
<td><span class='label-pri label-pri-<?php echo $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($storyLink,$story->title, '', "class='iframe' data-width='1000'");?></td>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo $story->estimate;?></td>
<td>
<span class='status-story status-<?php echo $story->status;?>'>
@@ -209,9 +209,9 @@ tbody tr td:first-child input{display:none;}
<?php echo $this->processStatus('bug', $bug);?>
</span>
</td>
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo substr($bug->openedDate, 5, 11)?></td>
<td><?php echo $users[$bug->resolvedBy];?></td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<td><?php echo substr($bug->resolvedDate, 5, 11)?></td>
<td class='c-actions'>
<?php
@@ -284,9 +284,9 @@ tbody tr td:first-child input{display:none;}
<?php echo $this->processStatus('bug', $bug);?>
</span>
</td>
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo substr($bug->openedDate, 5, 11)?></td>
<td><?php echo $users[$bug->resolvedBy];?></td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<td><?php echo substr($bug->resolvedDate, 5, 11)?></td>
</tr>
<?php endforeach;?>
@@ -321,7 +321,7 @@ tbody tr td:first-child input{display:none;}
</tr>
<tr>
<th><?php echo $lang->build->builder;?></th>
<td><?php echo $users[$build->builder];?></td>
<td><?php echo zget($users, $build->builder);?></td>
</tr>
<tr>
<th><?php echo $lang->build->date;?></th>
module/common/view/action.html.php
+2 -2
View File
@@ -50,8 +50,8 @@
<?php $canEditComment = (end($actions) == $action and $action->comment and $this->methodName == 'view' and $action->actor == $this->app->user->account and common::hasPriv('action', 'editComment'));?>
<li value='<?php echo $i ++;?>'>
<?php
if(isset($users[$action->actor])) $action->actor = $users[$action->actor];
if($action->action == 'assigned' and isset($users[$action->extra]) ) $action->extra = $users[$action->extra];
$action->actor = zget($users, $action->actor);
if($action->action == 'assigned') $action->extra = zget($users, $action->extra);
if(strpos($action->actor, ':') !== false) $action->actor = substr($action->actor, strpos($action->actor, ':') + 1);
?>
<?php $this->action->printAction($action);?>
module/common/view/mail.footer.html.php
+2 -2
View File
@@ -19,8 +19,8 @@ if(file_exists($extViewFile))
<?php endif;?>
<tr>
<td style='padding: 10px; background-color: #FFF0D5'>
<?php if(isset($users[$action->actor])) $action->actor = $users[$action->actor];?>
<?php if(isset($users[$action->extra])) $action->extra = $users[$action->extra];?>
<?php $action->actor = zget($users, $action->actor);?>
<?php $action->extra = zget($users, $action->extra);?>
<span style='font-size: 16px; color: #F1A325'>●</span> &nbsp;<span><?php $this->action->printAction($action);?></span>
</td>
</tr>
module/my/view/story.html.php
+1 -1
View File
@@ -73,7 +73,7 @@
<td class='c-product'><?php echo $story->productTitle;?></td>
<td class='c-name nobr'><?php echo html::a($storyLink, $story->title, null, "style='color: $story->color'");?></td>
<td class='c-plan'><?php echo $story->planTitle;?></td>
<td class='c-user'><?php echo $users[$story->openedBy];?></td>
<td class='c-user'><?php echo zget($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 $this->processStatus('story', $story);?></span></td>
<td class='c-stage'><?php echo zget($lang->story->stageList, $story->stage);?></td>
module/product/lang/zh-cn.php
+1
View File
@@ -73,6 +73,7 @@ $lang->product->order = '排序';
$lang->product->type = "{$lang->productCommon}类型";
$lang->product->typeAB = "类型";
$lang->product->status = '状态';
$lang->product->subStatus = '子状态';
$lang->product->desc = "{$lang->productCommon}描述";
$lang->product->manager = '负责人';
$lang->product->PO = "{$lang->productCommon}负责人";
module/product/view/build.html.php
+1 -1
View File
@@ -51,7 +51,7 @@
<td class='text-left' title="<?php echo $build->scmPath?>"><?php echo strpos($build->scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath;?></td>
<td class='text-left' title="<?php echo $build->filePath?>"><?php echo strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?></td>
<td><?php echo $build->date?></td>
<td><?php echo $users[$build->builder]?></td>
<td><?php echo zget($users, $build->builder);?></td>
<td class='c-actions'>
<?php
common::printIcon('testtask', 'create', "product=$product->id&project=0&build=$build->id", '', 'list', 'bullhorn');
module/productplan/view/linkbug.html.php
+2 -2
View File
@@ -44,8 +44,8 @@
</td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo $users[$bug->assignedTo];?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo zget($users, $bug->assignedTo);?></td>
<td>
<span class='status-bug status-<?php echo $bug->status?>'>
<?php echo $this->processStatus('bug', $bug);?>
module/project/view/all.html.php
+1 -1
View File
@@ -73,7 +73,7 @@
?>
</td>
<td class='text-left'><?php echo $project->code;?></td>
<td><?php echo $users[$project->PM];?></td>
<td><?php echo zget($users, $project->PM);?></td>
<td><?php echo $project->end;?></td>
<?php $status = $this->processStatus('project', $project);?>
<td class='c-status' title='<?php echo $status;?>'>
module/project/view/build.html.php
+1 -1
View File
@@ -61,7 +61,7 @@
<td class="c-url" title="<?php echo $build->scmPath?>"><?php echo strpos($build->scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath;?></td>
<td class="c-url" title="<?php echo $build->filePath?>"><?php echo strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?></td>
<td class="c-date"><?php echo $build->date?></td>
<td class="c-user em"><?php echo $users[$build->builder]?></td>
<td class="c-user em"><?php echo zget($users, $build->builder);?></td>
<td class="c-actions">
<?php
if(common::hasPriv('build', 'linkstory') and common::hasPriv('build', 'view'))
module/project/view/doc.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
<td><?php if($canView) echo html::a($viewLink, sprintf('%03d', $doc->id)); else printf('%03d', $doc->id);?></td>
<td><?php if(isset($modules[$doc->module]))print($modules[$doc->module]);?></td>
<td class='text-left nobr'><nobr><?php echo html::a($viewLink, $doc->title);?></nobr></td>
<td><?php echo $users[$doc->addedBy];?></td>
<td><?php echo zget($users, $doc->addedBy);?></td>
<td><?php echo $doc->addedDate;?></td>
<td>
<?php
module/project/view/grouptask.html.php
+2 -2
View File
@@ -181,7 +181,7 @@
<?php echo html::a('###', "<i class='icon-caret-down'></i> " . $groupName, '', "class='text-primary' title='$groupName'");?>
<div class='groupSummary small'>
<?php if($groupBy == 'assignedTo' and isset($members[$task->assignedTo])) printf($lang->project->memberHoursAB, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?>
<?php if($groupBy == 'assignedTo' and isset($members[$task->assignedTo])) printf($lang->project->memberHoursAB, zget($users, $task->assignedTo), $members[$task->assignedTo]->totalHours);?>
<?php printf($lang->project->groupSummaryAB, $groupSum, $groupWait, $groupDoing, $groupEstimate, $groupConsumed, $groupLeft);?>
</div>
</div>
@@ -221,7 +221,7 @@
</td>
<td colspan='13'>
<div class="table-row segments-list">
<?php if($groupBy == 'assignedTo' and isset($members[$task->assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?>
<?php if($groupBy == 'assignedTo' and isset($members[$task->assignedTo])) printf($lang->project->memberHours, zget($users, $task->assignedTo), $members[$task->assignedTo]->totalHours);?>
<?php printf($lang->project->countSummary, $groupSum, $groupDoing, $groupWait);?>
<?php printf($lang->project->timeSummary, $groupEstimate, $groupConsumed, $groupLeft);?>
</div>
module/project/view/story.html.php
+2 -2
View File
@@ -150,8 +150,8 @@
<?php if(isset($branchGroups[$story->product][$story->branch])) echo "<span class='label label-outline label-badge'>" . $branchGroups[$story->product][$story->branch] . '</span>';?>
<?php echo html::a($storyLink,$story->title, null, "style='color: $story->color'");?>
</td>
<td class='c-user' title='<?php echo $users[$story->openedBy];?>'><?php echo $users[$story->openedBy];?></td>
<td class='c-user' title='<?php echo $users[$story->assignedTo];?>'><?php echo $users[$story->assignedTo];?></td>
<td class='c-user' title='<?php echo zget($users, $story->openedBy);?>'><?php echo zget($users, $story->openedBy);?></td>
<td class='c-user' title='<?php echo zget($users, $story->assignedTo);?>'><?php echo zget($users, $story->assignedTo);?></td>
<td class='c-estimate'><?php echo $story->estimate;?></td>
<?php $status = $this->processStatus('story', $story);?>
<td class='c-status' title='<?php echo $status;?>'>
module/project/view/treestory.html.php
+6 -6
View File
@@ -153,7 +153,7 @@
{
foreach($mailto as $account)
{
if(empty($account)) continue; echo "<span>" . $users[trim($account)] . '</span> &nbsp;';
if(empty($account)) continue; echo "<span>" . zget($users, trim($account)) . '</span> &nbsp;';
}
}
?>
@@ -290,11 +290,11 @@
<tbody>
<tr>
<th class='w-100px'><?php echo $lang->story->openedBy;?></th>
<td><?php echo $users[$story->openedBy] . $lang->at . $story->openedDate;?></td>
<td><?php echo zget($users, $story->openedBy) . $lang->at . $story->openedDate;?></td>
</tr>
<tr>
<th><?php echo $lang->story->assignedTo;?></th>
<td><?php echo $story->assignedTo ? $users[$story->assignedTo] . $lang->at . $story->assignedDate : $lang->noData;?></td>
<td><?php echo $story->assignedTo ? zget($users, $story->assignedTo) . $lang->at . $story->assignedDate : $lang->noData;?></td>
</tr>
<tr>
<th><?php echo $lang->story->reviewedBy;?></th>
@@ -307,7 +307,7 @@
}
else
{
foreach($reviewedBy as $account) echo ' ' . $users[trim($account)];
foreach($reviewedBy as $account) echo ' ' . zget($users, trim($account));
}
?>
</td>
@@ -318,7 +318,7 @@
</tr>
<tr>
<th><?php echo $lang->story->closedBy;?></th>
<td><?php echo $story->closedBy ? $users[$story->closedBy] . $lang->at . $story->closedDate : $lang->noData;?></td>
<td><?php echo $story->closedBy ? zget($users, $story->closedBy) . $lang->at . $story->closedDate : $lang->noData;?></td>
</tr>
<tr>
<th><?php echo $lang->story->closedReason;?></th>
@@ -334,7 +334,7 @@
</tr>
<tr>
<th><?php echo $lang->story->lastEditedBy;?></th>
<td><?php echo $story->lastEditedBy ? $users[$story->lastEditedBy] . $lang->at . $story->lastEditedDate : $lang->noData;?></td>
<td><?php echo $story->lastEditedBy ? zget($users, $story->lastEditedBy) . $lang->at . $story->lastEditedDate : $lang->noData;?></td>
</tr>
</tbody>
</table>
module/release/view/linkbug.html.php
+2 -2
View File
@@ -48,8 +48,8 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
</td>
<td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo $users[$bug->resolvedBy];?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<td>
<span class='status-bug status-<?php echo $bug->status?>'><?php echo $this->processStatus('bug', $bug);?></span>
</td>
module/release/view/view.html.php
+3 -3
View File
@@ -106,7 +106,7 @@
</td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo $story->estimate;?></td>
<td>
<span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span>
@@ -181,9 +181,9 @@
<td>
<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 zget($users, $bug->openedBy);?></td>
<td><?php echo substr($bug->openedDate, 5, 11)?></td>
<td><?php echo $users[$bug->resolvedBy];?></td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<td><?php echo substr($bug->resolvedDate, 5, 11)?></td>
<td class='c-actions'>
<?php
module/search/model.php
+14 -1
View File
@@ -33,10 +33,23 @@ class searchModel extends model
foreach($fields as $field)
{
/* The built-in modules and user defined modules all have the subStatus field, so set its configuration first. */
if($field->field == 'subStatus')
{
$searchConfig['fields'][$field->field] = $field->name;
$searchConfig['params'][$field->field] = array('operator' => '=', 'control' => 'select', 'values' => $this->workflowfield->getSubStatusList($module));
continue;
}
/* The other built-in fields do not need to set their configuration. */
if($field->buildin) continue;
/* Set configuration for user defined fields. */
$operator = ($field->control == 'input' or $field->control == 'textarea') ? 'include' : '=';
$control = ($field->control == 'select' or $field->control == 'radio' or $field->control == 'checkbox') ? 'select' : 'input';
$options = $this->workflowfield->getFieldOptions($field);
$control = ($field->control == 'select' || $field->control == 'radio' || $field->control == 'checkbox') ? 'select' : 'input';
$searchConfig['fields'][$field->field] = $field->name;
$searchConfig['params'][$field->field] = array('operator' => $operator, 'control' => $control, 'values' => $options);
}
module/story/view/affected.html.php
+7 -7
View File
@@ -7,7 +7,7 @@
<div class='tab-content'>
<div class='tab-pane active' id='affectedProjects'>
<?php foreach($story->projects as $projectID => $project):?>
<h6><?php echo $project->name ?> &nbsp; <small><i class='icon-group'></i> <?php foreach($story->teams[$projectID] as $member) echo zget($users, $member->account, $member->account) . ' ';?></small></h6>
<h6><?php echo $project->name ?> &nbsp; <small><i class='icon-group'></i> <?php foreach($story->teams[$projectID] as $member) echo zget($users, $member->account) . ' ';?></small></h6>
<table class='table'>
<thead>
<tr class='text-center'>
@@ -25,7 +25,7 @@
<tr class='text-center'>
<td><?php echo $task->id;?></td>
<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><?php echo zget($users, $task->assignedTo);?></td>
<td>
<span class='status-task status-<?php echo $task->status?>'><?php echo $this->processStatus('task', $task);?></span>
</td>
@@ -59,10 +59,10 @@
<td>
<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>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<td class='text-left'><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
<td><?php echo $users[$bug->lastEditedBy];?></td>
<td><?php echo zget($users, $bug->lastEditedBy);?></td>
</tr>
<?php endforeach;?>
</tbody>
@@ -87,8 +87,8 @@
<td>
<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>
<td><?php echo zget($users, $case->openedBy);?></td>
<td><?php echo zget($users, $case->lastEditedBy);?></td>
</tr>
<?php endforeach;?>
</tbody>
module/story/view/edit.html.php
+1 -1
View File
@@ -172,7 +172,7 @@
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->story->openedBy;?></th>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo zget($users, $story->openedBy);?></td>
</tr>
<tr>
<th><?php echo $lang->story->assignedTo;?></th>
module/story/view/view.html.php
+6 -6
View File
@@ -226,7 +226,7 @@
</tr>
<tr>
<th><?php echo $lang->story->legendMailto;?></th>
<td><?php $mailto = explode(',', $story->mailto); foreach($mailto as $account) {if(empty($account)) continue; echo "<span>" . $users[trim($account)] . '</span> &nbsp;'; }?></td>
<td><?php $mailto = explode(',', $story->mailto); foreach($mailto as $account) {if(empty($account)) continue; echo "<span>" . zget($users, trim($account)) . '</span> &nbsp;'; }?></td>
</tr>
</tbody>
</table>
@@ -236,15 +236,15 @@
<tbody>
<tr>
<th class='thWidth'><?php echo $lang->story->openedBy;?></th>
<td><?php echo $users[$story->openedBy] . $lang->at . $story->openedDate;?></td>
<td><?php echo zget($users, $story->openedBy) . $lang->at . $story->openedDate;?></td>
</tr>
<tr>
<th><?php echo $lang->story->assignedTo;?></th>
<td><?php if($story->assignedTo) echo $users[$story->assignedTo] . $lang->at . $story->assignedDate;?></td>
<td><?php if($story->assignedTo) echo zget($users, $story->assignedTo) . $lang->at . $story->assignedDate;?></td>
</tr>
<tr>
<th><?php echo $lang->story->reviewedBy;?></th>
<td><?php $reviewedBy = explode(',', $story->reviewedBy); foreach($reviewedBy as $account) echo ' ' . $users[trim($account)]; ?></td>
<td><?php $reviewedBy = explode(',', $story->reviewedBy); foreach($reviewedBy as $account) echo ' ' . zget($users, trim($account)); ?></td>
</tr>
<tr>
<th><?php echo $lang->story->reviewedDate;?></th>
@@ -252,7 +252,7 @@
</tr>
<tr>
<th><?php echo $lang->story->closedBy;?></th>
<td><?php if($story->closedBy) echo $users[$story->closedBy] . $lang->at . $story->closedDate;?></td>
<td><?php if($story->closedBy) echo zget($users, $story->closedBy) . $lang->at . $story->closedDate;?></td>
</tr>
<tr>
<th><?php echo $lang->story->closedReason;?></th>
@@ -268,7 +268,7 @@
</tr>
<tr>
<th><?php echo $lang->story->lastEditedBy;?></th>
<td><?php if($story->lastEditedBy) echo $users[$story->lastEditedBy] . $lang->at . $story->lastEditedDate;?></td>
<td><?php if($story->lastEditedBy) echo zget($users, $story->lastEditedBy) . $lang->at . $story->lastEditedDate;?></td>
</tr>
</tbody>
</table>
module/story/view/zerocase.html.php
+2 -2
View File
@@ -59,8 +59,8 @@
<td class='text-left' title="<?php echo $story->title?>"><nobr><?php echo html::a($viewLink, $story->title);?></nobr></td>
<td title="<?php echo $story->planTitle?>"><?php echo $story->planTitle;?></td>
<td><?php echo $lang->story->sourceList[$story->source];?></td>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $users[$story->assignedTo];?></td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo zget($users, $story->assignedTo);?></td>
<td><?php echo $story->estimate;?></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>
module/task/view/edit.html.php
+1 -1
View File
@@ -179,7 +179,7 @@
<table class='table table-form'>
<tr>
<th class='lifeThWidth'><?php echo $lang->task->openedBy;?></th>
<td><?php echo $users[$task->openedBy];?></td>
<td><?php echo zget($users, $task->openedBy);?></td>
</tr>
<tr>
<th><?php echo $lang->task->realStarted;?></th>
module/task/view/view.html.php
+1 -1
View File
@@ -120,7 +120,7 @@
</td>
<td class='text-left' title='<?php echo $child->name;?>'><a class="iframe" data-width="90%" href="<?php echo $this->createLink('task', 'view', "taskID=$child->id", '', true); ?>"><?php echo $child->name;?></a></td>
<td><?php echo $child->deadline;?></td>
<td><?php if(isset($users[$child->assignedTo])) echo $users[$child->assignedTo];?></td>
<td><?php echo zget($users, $child->assignedTo);?></td>
<td><?php echo $this->processStatus('task', $child);?></td>
<td class='visible-lg'><?php echo $child->consumed;?></td>
<td class='visible-lg'><?php echo $child->left;?></td>
module/testcase/view/edit.html.php
+2 -2
View File
@@ -253,11 +253,11 @@
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->testcase->openedBy;?></th>
<td><?php echo $users[$case->openedBy] . $lang->at . $case->openedDate;?></td>
<td><?php echo zget($users, $case->openedBy) . $lang->at . $case->openedDate;?></td>
</tr>
<tr>
<th><?php echo $lang->testcase->lblLastEdited;?></th>
<td><?php if($case->lastEditedBy) echo $users[$case->lastEditedBy] . $lang->at . $case->lastEditedDate;?></td>
<td><?php if($case->lastEditedBy) echo zget($users, $case->lastEditedBy) . $lang->at . $case->lastEditedDate;?></td>
</tr>
</table>
</div>
module/testcase/view/linkcases.html.php
+1 -1
View File
@@ -55,7 +55,7 @@
<td><?php echo html::a($this->createLink('product', 'browse', "productID={$case2Link->product}&branch={$case2Link->branch}"), $products[$case2Link->product], '_blank');?></td>
<td class='text-left' title='<?php echo $case2Link->title;?>'><?php echo html::a($this->createLink('testcase', 'view', "caseID=$case2Link->id"), $case2Link->title, '_blank');?></td>
<td><?php echo $lang->testcase->typeList[$case2Link->type];?></td>
<td><?php echo $users[$case2Link->openedBy];?></td>
<td><?php echo zget($users, $case2Link->openedBy);?></td>
<td class='case-<?php echo $case2Link->status?>'><?php echo $this->processStatus('testcase', $case2Link);?></td>
</tr>
<?php $caseCount ++;?>
module/testcase/view/view.html.php
+3 -3
View File
@@ -307,12 +307,12 @@
<table class='table table-data'>
<tr>
<th class='lifeThWidth'><?php echo $lang->testcase->openedBy;?></th>
<td><?php echo $users[$case->openedBy] . $lang->at . $case->openedDate;?></td>
<td><?php echo zget($users, $case->openedBy) . $lang->at . $case->openedDate;?></td>
</tr>
<?php if($config->testcase->needReview or !empty($config->testcase->forceReview)):?>
<tr>
<th><?php echo $lang->testcase->reviewedBy;?></th>
<td><?php $reviewedBy = explode(',', $case->reviewedBy); foreach($reviewedBy as $account) echo ' ' . $users[trim($account)]; ?></td>
<td><?php $reviewedBy = explode(',', $case->reviewedBy); foreach($reviewedBy as $account) echo ' ' . zget($users, trim($account)); ?></td>
</tr>
<tr>
<th><?php echo $lang->testcase->reviewedDate;?></th>
@@ -321,7 +321,7 @@
<?php endif;?>
<tr>
<th><?php echo $lang->testcase->lblLastEdited;?></th>
<td><?php if($case->lastEditedBy) echo $users[$case->lastEditedBy] . $lang->at . $case->lastEditedDate;?></td>
<td><?php if($case->lastEditedBy) echo zget($users, $case->lastEditedBy) . $lang->at . $case->lastEditedDate;?></td>
</tr>
</table>
</div>
module/testsuite/view/library.html.php
+1 -1
View File
@@ -136,7 +136,7 @@ js::set('flow', $config->global->flow);
<?php echo html::a($viewLink, $case->title, null, "style='color: $case->color'");?>
</td>
<td><?php echo $lang->testcase->typeList[$case->type];?></td>
<td><?php echo $users[$case->openedBy];?></td>
<td><?php echo zget($users, $case->openedBy);?></td>
<td class='<?php if(isset($run)) echo $run->status;?> testcase-<?php echo $case->status?>'> <?php echo $this->processStatus('testcase', $case);?></td>
<td class='c-actions'>
<?php
module/testtask/view/results.html.php
+1 -1
View File
@@ -40,7 +40,7 @@
<tr class='result-item' id='result-<?php echo $class?>' style='cursor: pointer'>
<td class='w-120px'> &nbsp; #<?php echo $result->id?></td>
<td class='w-180px'><?php echo $result->date;?></td>
<td><?php echo $users[$result->lastRunner] . ' ' . $lang->testtask->runCase;?></td>
<td><?php echo zget($users, $result->lastRunner) . ' ' . $lang->testtask->runCase;?></td>
<td class='w-150px'><?php echo zget($builds, $result->build, '');?></td>
<td class='w-50px text-right'><strong class='text-<?php echo $class;?>'><?php echo $lang->testcase->resultList[$result->caseResult]?></strong></td>
<td class='w-60px'><?php if(!empty($result->files)) echo html::a("#caseResult{$result->id}", $lang->files . $fileCount, '', "data-toggle='modal' data-type='iframe'")?></td>
module/user/view/testcase.html.php
+2 -2
View File
@@ -54,8 +54,8 @@
<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 class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title);?></td>
<td><?php echo $lang->testcase->typeList[$case->type];?></td>
<td><?php echo $users[$case->openedBy];?></td>
<td><?php echo $users[$case->lastRunner];?></td>
<td><?php echo zget($users, $case->openedBy);?></td>
<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 echo $case->status;?>'><?php echo $this->processStatus('testcase', $case);?></td>