From 45ed66d89c2b2336d02bf2e4180f46c9078c9815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=A1=95?= Date: Tue, 6 Feb 2024 09:42:19 +0800 Subject: [PATCH] Fix bug #44957. --- module/testtask/lang/zh-cn.php | 1 + module/user/ui/testtask.html.php | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 82ffa1d405..5053ccb1ae 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -88,6 +88,7 @@ $lang->testtask->realFinishedDate = '实际完成日期'; $lang->testtask->desc = '描述'; $lang->testtask->mailto = '抄送给'; $lang->testtask->status = '当前状态'; +$lang->testtask->statusAB = '状态'; $lang->testtask->subStatus = '子状态'; $lang->testtask->testreport = '相关测试报告'; $lang->testtask->assignedTo = '指派给'; diff --git a/module/user/ui/testtask.html.php b/module/user/ui/testtask.html.php index 328fbb2d4b..30cf37e60d 100644 --- a/module/user/ui/testtask.html.php +++ b/module/user/ui/testtask.html.php @@ -14,10 +14,20 @@ include './featurebar.html.php'; jsVar('trunkLang', $lang->trunk); $that = zget($lang->user->thirdPerson, $user->gender); -$testtaskNavs['assignedTo'] = array('text' => sprintf($lang->user->testTask2Him, $that), 'url' => inlink('testtask', "userID={$user->id}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table', 'active' => true); +$testtaskNavs['assignedTo'] = array('text' => sprintf($lang->user->testTask2Him, $that), 'url' => inlink('testtask', "userID={$user->id}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), 'load' => 'table', 'active' => true); $cols = array(); foreach($config->user->defaultFields['testtask'] as $field) $cols[$field] = $config->testtask->dtable->fieldList[$field]; + +$statusKey = 'status'; +$titleKey = 'title'; +$statusValue = $cols[$statusKey]; +$statusValue['title'] = $lang->testtask->statusAB; +unset($cols[$statusKey]); + +$titleIndex = array_search($titleKey, array_keys($cols)) + 1; +$cols = array_merge(array_slice($cols, 0, $titleIndex), array($statusKey => $statusValue), array_slice($cols, $titleIndex)); + $cols['id']['checkbox'] = false; $cols = array_map(function($col)