diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php index ef7c090b5e..d38027d700 100755 --- a/module/action/view/trash.html.php +++ b/module/action/view/trash.html.php @@ -63,7 +63,7 @@ } ?> - actor];?> + actor);?> date;?> 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 "
  • "; diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 0bbaf8cf4e..93e71d744d 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -213,7 +213,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); bug->openedBy;?> - openedBy];?> + openedBy);?> bug->openedBuild;?> diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index a4326a40e8..e96b3900fe 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -199,7 +199,7 @@ bug->lblAssignedTo;?> - assignedTo) echo $users[$bug->assignedTo] . $lang->at . $bug->assignedDate;?> + assignedTo) echo zget($users, $bug->assignedTo) . $lang->at . $bug->assignedDate;?> bug->deadline;?> @@ -224,7 +224,7 @@ bug->mailto;?> - mailto)); foreach($mailto as $account) echo ' ' . $users[$account]; ?> + mailto)); foreach($mailto as $account) echo ' ' . zget($users, $account); ?> diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php index fda90de279..c6c24e9dc8 100644 --- a/module/build/view/linkbug.html.php +++ b/module/build/view/linkbug.html.php @@ -45,8 +45,8 @@ bug->priList, $bug->pri, $bug->pri)?> createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> - openedBy];?> - status == 'resolved' or $bug->status == 'closed') ? $users[$bug->resolvedBy] : html::select("resolvedBy[{$bug->id}]", $users, $this->app->user->account, "class='form-control chosen'");?> + openedBy);?> + status == 'resolved' or $bug->status == 'closed') ? zget($users, $bug->resolvedBy) : html::select("resolvedBy[{$bug->id}]", $users, $this->app->user->account, "class='form-control chosen'");?> processStatus('bug', $bug);?> diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php index 308efa3590..c5d5d0d988 100644 --- a/module/build/view/linkstory.html.php +++ b/module/build/view/linkstory.html.php @@ -47,8 +47,8 @@ story->priList, $story->pri, $story->pri)?> createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> - openedBy];?> - assignedTo];?> + openedBy);?> + assignedTo);?> estimate;?> diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index cd883be5ff..f968eadafd 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -131,7 +131,7 @@ tbody tr td:first-child input{display:none;} story->priList, $story->pri, $story->pri);?> title, '', "class='iframe' data-width='1000'");?> - openedBy];?> + openedBy);?> estimate;?> @@ -209,9 +209,9 @@ tbody tr td:first-child input{display:none;} processStatus('bug', $bug);?> - openedBy];?> + openedBy);?> openedDate, 5, 11)?> - resolvedBy];?> + resolvedBy);?> resolvedDate, 5, 11)?> processStatus('bug', $bug);?> - openedBy];?> + openedBy);?> openedDate, 5, 11)?> - resolvedBy];?> + resolvedBy);?> resolvedDate, 5, 11)?> @@ -321,7 +321,7 @@ tbody tr td:first-child input{display:none;} build->builder;?> - builder];?> + builder);?> build->date;?> diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php index b0748d38c5..3041029907 100755 --- a/module/common/view/action.html.php +++ b/module/common/view/action.html.php @@ -50,8 +50,8 @@ comment and $this->methodName == 'view' and $action->actor == $this->app->user->account and common::hasPriv('action', 'editComment'));?>
  • 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); ?> action->printAction($action);?> diff --git a/module/common/view/mail.footer.html.php b/module/common/view/mail.footer.html.php index f7cd1569bf..a0ac434a50 100644 --- a/module/common/view/mail.footer.html.php +++ b/module/common/view/mail.footer.html.php @@ -19,8 +19,8 @@ if(file_exists($extViewFile)) - actor])) $action->actor = $users[$action->actor];?> - extra])) $action->extra = $users[$action->extra];?> + actor = zget($users, $action->actor);?> + extra = zget($users, $action->extra);?> ●  action->printAction($action);?> diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 63c4ee9d4c..6fa9711ef2 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -73,7 +73,7 @@ productTitle;?> title, null, "style='color: $story->color'");?> planTitle;?> - openedBy];?> + openedBy);?> estimate;?> processStatus('story', $story);?> story->stageList, $story->stage);?> diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 68476e9fa0..42110a75cc 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -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}负责人"; diff --git a/module/product/view/build.html.php b/module/product/view/build.html.php index fbbcf67135..1c74e09239 100644 --- a/module/product/view/build.html.php +++ b/module/product/view/build.html.php @@ -51,7 +51,7 @@ scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath;?> filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?> date?> - builder]?> + builder);?> id&project=0&build=$build->id", '', 'list', 'bullhorn'); diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php index 0b4600f80a..b1f8beaddf 100644 --- a/module/productplan/view/linkbug.html.php +++ b/module/productplan/view/linkbug.html.php @@ -44,8 +44,8 @@ bug->priList, $bug->pri, $bug->pri)?> createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> - openedBy];?> - assignedTo];?> + openedBy);?> + assignedTo);?> processStatus('bug', $bug);?> diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php index ff9fb8d19c..8a1f9969c6 100644 --- a/module/project/view/all.html.php +++ b/module/project/view/all.html.php @@ -73,7 +73,7 @@ ?> code;?> - PM];?> + PM);?> end;?> processStatus('project', $project);?> diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php index 7765724589..7dbd60df47 100644 --- a/module/project/view/build.html.php +++ b/module/project/view/build.html.php @@ -61,7 +61,7 @@ scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath;?> filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?> date?> - builder]?> + builder);?> id)); else printf('%03d', $doc->id);?> module]))print($modules[$doc->module]);?> title);?> - addedBy];?> + addedBy);?> addedDate;?> " . $groupName, '', "class='text-primary' title='$groupName'");?>
    - assignedTo])) printf($lang->project->memberHoursAB, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?> + assignedTo])) printf($lang->project->memberHoursAB, zget($users, $task->assignedTo), $members[$task->assignedTo]->totalHours);?> project->groupSummaryAB, $groupSum, $groupWait, $groupDoing, $groupEstimate, $groupConsumed, $groupLeft);?>
    @@ -221,7 +221,7 @@
    - assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?> + assignedTo])) printf($lang->project->memberHours, zget($users, $task->assignedTo), $members[$task->assignedTo]->totalHours);?> project->countSummary, $groupSum, $groupDoing, $groupWait);?> project->timeSummary, $groupEstimate, $groupConsumed, $groupLeft);?>
    diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index c687cbbe7a..de991ced66 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -150,8 +150,8 @@ product][$story->branch])) echo "" . $branchGroups[$story->product][$story->branch] . '';?> title, null, "style='color: $story->color'");?> - openedBy];?> - assignedTo];?> + openedBy);?> + assignedTo);?> estimate;?> processStatus('story', $story);?> diff --git a/module/project/view/treestory.html.php b/module/project/view/treestory.html.php index 6e6f6075c6..61eb409fe7 100644 --- a/module/project/view/treestory.html.php +++ b/module/project/view/treestory.html.php @@ -153,7 +153,7 @@ { foreach($mailto as $account) { - if(empty($account)) continue; echo "" . $users[trim($account)] . '  '; + if(empty($account)) continue; echo "" . zget($users, trim($account)) . '  '; } } ?> @@ -290,11 +290,11 @@ story->openedBy;?> - openedBy] . $lang->at . $story->openedDate;?> + openedBy) . $lang->at . $story->openedDate;?> story->assignedTo;?> - assignedTo ? $users[$story->assignedTo] . $lang->at . $story->assignedDate : $lang->noData;?> + assignedTo ? zget($users, $story->assignedTo) . $lang->at . $story->assignedDate : $lang->noData;?> story->reviewedBy;?> @@ -307,7 +307,7 @@ } else { - foreach($reviewedBy as $account) echo ' ' . $users[trim($account)]; + foreach($reviewedBy as $account) echo ' ' . zget($users, trim($account)); } ?> @@ -318,7 +318,7 @@ story->closedBy;?> - closedBy ? $users[$story->closedBy] . $lang->at . $story->closedDate : $lang->noData;?> + closedBy ? zget($users, $story->closedBy) . $lang->at . $story->closedDate : $lang->noData;?> story->closedReason;?> @@ -334,7 +334,7 @@ story->lastEditedBy;?> - lastEditedBy ? $users[$story->lastEditedBy] . $lang->at . $story->lastEditedDate : $lang->noData;?> + lastEditedBy ? zget($users, $story->lastEditedBy) . $lang->at . $story->lastEditedDate : $lang->noData;?> diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php index 1bd5495613..d0baad0a1a 100644 --- a/module/release/view/linkbug.html.php +++ b/module/release/view/linkbug.html.php @@ -48,8 +48,8 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm'; bug->priList, $bug->pri, $bug->pri)?> createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> - openedBy];?> - resolvedBy];?> + openedBy);?> + resolvedBy);?> processStatus('bug', $bug);?> diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index ac3546430e..0b295c42c9 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -106,7 +106,7 @@ pri;?>' title='story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> title, '', "class='preview'");?> - openedBy];?> + openedBy);?> estimate;?> processStatus('story', $story);?> @@ -181,9 +181,9 @@ processStatus('bug', $bug);?> - openedBy];?> + openedBy);?> openedDate, 5, 11)?> - resolvedBy];?> + resolvedBy);?> resolvedDate, 5, 11)?> 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); } diff --git a/module/story/view/affected.html.php b/module/story/view/affected.html.php index e435960383..bd7acfb129 100644 --- a/module/story/view/affected.html.php +++ b/module/story/view/affected.html.php @@ -7,7 +7,7 @@
    projects as $projectID => $project):?> -
    name ?>   teams[$projectID] as $member) echo zget($users, $member->account, $member->account) . ' ';?>
    +
    name ?>   teams[$projectID] as $member) echo zget($users, $member->account) . ' ';?>
    @@ -25,7 +25,7 @@ - + @@ -59,10 +59,10 @@ - - + + - + @@ -87,8 +87,8 @@ - - + + diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index 96473dcb3a..35d4d3f93b 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -172,7 +172,7 @@
    id;?> createLink('task', 'view', "taskID=$task->id"), $task->name, '_blank');?>assignedTo];?>assignedTo);?> processStatus('task', $task);?> processStatus('bug', $bug);?> openedBy];?>resolvedBy];?>openedBy);?>resolvedBy);?> bug->resolutionList[$bug->resolution];?>lastEditedBy];?>lastEditedBy);?>
    processStatus('testcase', $case);?> openedBy];?>lastEditedBy];?>openedBy);?>lastEditedBy);?>
    - + diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 06ca7f37a0..8999f0e8ce 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -226,7 +226,7 @@ - +
    story->openedBy;?>openedBy];?>openedBy);?>
    story->assignedTo;?>
    story->legendMailto;?>mailto); foreach($mailto as $account) {if(empty($account)) continue; echo "" . $users[trim($account)] . '  '; }?>mailto); foreach($mailto as $account) {if(empty($account)) continue; echo "" . zget($users, trim($account)) . '  '; }?>
    @@ -236,15 +236,15 @@ story->openedBy;?> - openedBy] . $lang->at . $story->openedDate;?> + openedBy) . $lang->at . $story->openedDate;?> story->assignedTo;?> - assignedTo) echo $users[$story->assignedTo] . $lang->at . $story->assignedDate;?> + assignedTo) echo zget($users, $story->assignedTo) . $lang->at . $story->assignedDate;?> story->reviewedBy;?> - reviewedBy); foreach($reviewedBy as $account) echo ' ' . $users[trim($account)]; ?> + reviewedBy); foreach($reviewedBy as $account) echo ' ' . zget($users, trim($account)); ?> story->reviewedDate;?> @@ -252,7 +252,7 @@ story->closedBy;?> - closedBy) echo $users[$story->closedBy] . $lang->at . $story->closedDate;?> + closedBy) echo zget($users, $story->closedBy) . $lang->at . $story->closedDate;?> story->closedReason;?> @@ -268,7 +268,7 @@ story->lastEditedBy;?> - lastEditedBy) echo $users[$story->lastEditedBy] . $lang->at . $story->lastEditedDate;?> + lastEditedBy) echo zget($users, $story->lastEditedBy) . $lang->at . $story->lastEditedDate;?> diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php index 6617c1c291..30dd5da12c 100644 --- a/module/story/view/zerocase.html.php +++ b/module/story/view/zerocase.html.php @@ -59,8 +59,8 @@ title);?> planTitle;?> story->sourceList[$story->source];?> - openedBy];?> - assignedTo];?> + openedBy);?> + assignedTo);?> estimate;?> processStatus('story', $story);?> story->stageList, $story->stage);?> diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 9e4ab2682d..d3d786e9d2 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -179,7 +179,7 @@ - + diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index d30c456c50..53ab880355 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -120,7 +120,7 @@ - + diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index 40d60dc641..0998ea6a33 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -253,11 +253,11 @@
    task->openedBy;?>openedBy];?>openedBy);?>
    task->realStarted;?> id", '', true); ?>">name;?> deadline;?>assignedTo])) echo $users[$child->assignedTo];?>assignedTo);?> processStatus('task', $child);?> consumed;?> left;?>
    - + - +
    testcase->openedBy;?>openedBy] . $lang->at . $case->openedDate;?>openedBy) . $lang->at . $case->openedDate;?>
    testcase->lblLastEdited;?>lastEditedBy) echo $users[$case->lastEditedBy] . $lang->at . $case->lastEditedDate;?>lastEditedBy) echo zget($users, $case->lastEditedBy) . $lang->at . $case->lastEditedDate;?>
    diff --git a/module/testcase/view/linkcases.html.php b/module/testcase/view/linkcases.html.php index eba66b6da4..e0877ea3bd 100644 --- a/module/testcase/view/linkcases.html.php +++ b/module/testcase/view/linkcases.html.php @@ -55,7 +55,7 @@ createLink('product', 'browse', "productID={$case2Link->product}&branch={$case2Link->branch}"), $products[$case2Link->product], '_blank');?> createLink('testcase', 'view', "caseID=$case2Link->id"), $case2Link->title, '_blank');?> testcase->typeList[$case2Link->type];?> - openedBy];?> + openedBy);?> processStatus('testcase', $case2Link);?> diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 9f08d6d554..d74247c4cb 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -307,12 +307,12 @@ - + testcase->needReview or !empty($config->testcase->forceReview)):?> - + @@ -321,7 +321,7 @@ - +
    testcase->openedBy;?>openedBy] . $lang->at . $case->openedDate;?>openedBy) . $lang->at . $case->openedDate;?>
    testcase->reviewedBy;?>reviewedBy); foreach($reviewedBy as $account) echo ' ' . $users[trim($account)]; ?>reviewedBy); foreach($reviewedBy as $account) echo ' ' . zget($users, trim($account)); ?>
    testcase->reviewedDate;?>
    testcase->lblLastEdited;?>lastEditedBy) echo $users[$case->lastEditedBy] . $lang->at . $case->lastEditedDate;?>lastEditedBy) echo zget($users, $case->lastEditedBy) . $lang->at . $case->lastEditedDate;?>
    diff --git a/module/testsuite/view/library.html.php b/module/testsuite/view/library.html.php index eb308dd9b3..1f1cee3ef4 100644 --- a/module/testsuite/view/library.html.php +++ b/module/testsuite/view/library.html.php @@ -136,7 +136,7 @@ js::set('flow', $config->global->flow); title, null, "style='color: $case->color'");?> testcase->typeList[$case->type];?> - openedBy];?> + openedBy);?> processStatus('testcase', $case);?> ' style='cursor: pointer'>   #id?> date;?> - lastRunner] . ' ' . $lang->testtask->runCase;?> + lastRunner) . ' ' . $lang->testtask->runCase;?> build, '');?> testcase->resultList[$result->caseResult]?> files)) echo html::a("#caseResult{$result->id}", $lang->files . $fileCount, '', "data-toggle='modal' data-type='iframe'")?> diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php index 8932530a56..7648ef036b 100755 --- a/module/user/view/testcase.html.php +++ b/module/user/view/testcase.html.php @@ -54,8 +54,8 @@ testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri)?> createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title);?> testcase->typeList[$case->type];?> - openedBy];?> - lastRunner];?> + openedBy);?> + lastRunner);?> lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> processStatus('testcase', $case);?>