From a16db808d2726b5aa6f258e9ed04405c54433f75 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 17 Oct 2022 10:56:26 +0800 Subject: [PATCH 1/9] * Fix bug #28488. --- module/testtask/view/browse.html.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php index ce89350bef..eb65e3c4d5 100644 --- a/module/testtask/view/browse.html.php +++ b/module/testtask/view/browse.html.php @@ -17,8 +17,9 @@ session->testTaskVersionScope; $status = $this->session->testTaskVersionStatus; +$status = strtolower($status); ?> - + From 80b66aea5c77595ff91c6c444ca10050d80ca794 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 17 Oct 2022 11:12:48 +0800 Subject: [PATCH 2/9] * Fix bug #28490. --- module/execution/js/testtask.js | 4 +- module/execution/view/testtask.html.php | 6 +- module/my/view/testtask.html.php | 2 +- module/project/view/testtask.html.php | 4 +- module/testtask/lang/de.php | 5 +- module/testtask/lang/en.php | 3 +- module/testtask/lang/fr.php | 3 +- module/testtask/lang/zh-cn.php | 87 +++++++++++++------------ module/testtask/view/browse.html.php | 4 +- module/user/view/testtask.html.php | 4 +- 10 files changed, 68 insertions(+), 54 deletions(-) diff --git a/module/execution/js/testtask.js b/module/execution/js/testtask.js index cb4ee2d5cc..7b904e5b23 100644 --- a/module/execution/js/testtask.js +++ b/module/execution/js/testtask.js @@ -11,10 +11,12 @@ $(function() var checkedWait = $checkedRows.filter("[data-status=wait]").length; var checkedTesting = $checkedRows.filter("[data-status=doing]").length; var checkedBlocked = $checkedRows.filter("[data-status=blocked]").length; + var checkedDone = $checkedRows.filter("[data-status=done]").length; var checkedStatistics = checkedAllSummary.replace('%total%', checkedTotal) .replace('%wait%', checkedWait) .replace('%testing%', checkedTesting) - .replace('%blocked%', checkedBlocked); + .replace('%blocked%', checkedBlocked) + .replace('%done%', checkedDone); return checkedTotal ? checkedStatistics : pageSummary; } diff --git a/module/execution/view/testtask.html.php b/module/execution/view/testtask.html.php index feb078964d..934c4e3ca7 100644 --- a/module/execution/view/testtask.html.php +++ b/module/execution/view/testtask.html.php @@ -37,6 +37,7 @@ $waitCount = 0; $testingCount = 0; $blockedCount = 0; +$doneCount = 0; ?>
@@ -80,6 +81,7 @@ $blockedCount = 0; status == 'wait') $waitCount ++;?> status == 'doing') $testingCount ++;?> status == 'blocked') $blockedCount ++;?> + status == 'done') $doneCount ++;?> data-status='status;?>'> @@ -144,12 +146,12 @@ $blockedCount = 0; ?>
-
testtask->allSummary, $total, $waitCount, $testingCount, $blockedCount);?>
+
testtask->allSummary, $total, $waitCount, $testingCount, $blockedCount, $doneCount);?>
show('right', 'pagerjs');?> -testtask->allSummary, $total, $waitCount, $testingCount, $blockedCount));?> +testtask->allSummary, $total, $waitCount, $testingCount, $blockedCount, $doneCount));?> testtask->checkedAllSummary);?> diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index 8bf8ac97e4..395c064bb9 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -80,7 +80,7 @@
-
rawMethod == 'work' ? sprintf($lang->testtask->allSummary, count($tasks), $waitCount, $testingCount, $blockedCount) : sprintf($lang->testtask->pageSummary, count($tasks));?>
+
rawMethod == 'work' ? sprintf($lang->testtask->mySummary, count($tasks), $waitCount, $testingCount, $blockedCount) : sprintf($lang->testtask->pageSummary, count($tasks));?>
show('right', 'pagerjs');?>
diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php index 40943f8e67..00f5400a4f 100644 --- a/module/project/view/testtask.html.php +++ b/module/project/view/testtask.html.php @@ -68,6 +68,7 @@ $waitCount = 0; $testingCount = 0; $blockedCount = 0; + $doneCount = 0; ?> $productTasks):?> @@ -75,6 +76,7 @@ status == 'wait') $waitCount ++;?> status == 'doing') $testingCount ++;?> status == 'blocked') $blockedCount ++;?> + status == 'done') $doneCount ++;?> > @@ -125,7 +127,7 @@
-
testtask->allSummary, $total, $waitCount, $testingCount, $blockedCount);?>
+
testtask->allSummary, $total, $waitCount, $testingCount, $blockedCount, $doneCount);?>
show('right', 'pagerjs');?>
diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php index 1580a0ebd4..256a795308 100644 --- a/module/testtask/lang/de.php +++ b/module/testtask/lang/de.php @@ -106,8 +106,9 @@ $lang->testtask->passCount = 'Pass'; $lang->testtask->failCount = 'Fail'; $lang->testtask->summary = '%s cases, %s failures, %s time.'; $lang->testtask->pageSummary = 'Total testtasks: %s.'; -$lang->testtask->allSummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s.'; -$lang->testtask->checkedAllSummary = 'Seleted: %total%, Wait: %wait%, Testing: %testing%, Blocked: %blocked%.'; +$lang->testtask->mySummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s.'; +$lang->testtask->allSummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s, Done: %s.'; +$lang->testtask->checkedAllSummary = 'Seleted: %total%, Wait: %wait%, Testing: %testing%, Blocked: %blocked%, Done: %done%.'; $lang->testtask->beginAndEnd = 'Datum'; $lang->testtask->to = 'An'; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 42a1b628b2..8fc53837ba 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -106,7 +106,8 @@ $lang->testtask->passCount = 'Pass'; $lang->testtask->failCount = 'Fail'; $lang->testtask->summary = '%s cases, %s failures, %s time.'; $lang->testtask->pageSummary = 'Total testtasks: %s.'; -$lang->testtask->allSummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s.'; +$lang->testtask->mySummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s.'; +$lang->testtask->allSummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s, Done: %s.'; $lang->testtask->checkedAllSummary = 'Seleted: %total%, Wait: %wait%, Testing: %testing%, Blocked: %blocked%.'; $lang->testtask->beginAndEnd = 'Duration'; diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php index 760cbd57c5..2726b92d53 100644 --- a/module/testtask/lang/fr.php +++ b/module/testtask/lang/fr.php @@ -106,7 +106,8 @@ $lang->testtask->passCount = 'Pass'; $lang->testtask->failCount = 'Fail'; $lang->testtask->summary = '%s CasTest, %s échecs, %s heures.'; $lang->testtask->pageSummary = 'Total testtasks: %s.'; -$lang->testtask->allSummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s.'; +$lang->testtask->mySummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s.'; +$lang->testtask->allSummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s, Done: %s.'; $lang->testtask->checkedAllSummary = 'Seleted: %total%, Wait: %wait%, Testing: %testing%, Blocked: %blocked%.'; $lang->testtask->beginAndEnd = 'Durée'; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 51068da86b..89383c248e 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -65,49 +65,50 @@ $lang->testtask->startAction = "开始测试单"; $lang->testtask->resultsAction = "用例结果"; $lang->testtask->reportAction = '用例报表统计'; -$lang->testtask->id = '编号'; -$lang->testtask->common = '测试单'; -$lang->testtask->product = '所属' . $lang->productCommon; -$lang->testtask->project = '所属项目'; -$lang->testtask->execution = '所属' . $lang->execution->common; -$lang->testtask->type = '测试类型'; -$lang->testtask->build = '版本'; -$lang->testtask->owner = '负责人'; -$lang->testtask->executor = '执行人'; -$lang->testtask->execTime = '执行时间'; -$lang->testtask->pri = '优先级'; -$lang->testtask->name = '名称'; -$lang->testtask->begin = '开始日期'; -$lang->testtask->end = '结束日期'; -$lang->testtask->realFinishedDate = '实际完成日期'; -$lang->testtask->desc = '描述'; -$lang->testtask->mailto = '抄送给'; -$lang->testtask->status = '当前状态'; -$lang->testtask->subStatus = '子状态'; -$lang->testtask->testreport = '相关测试报告'; -$lang->testtask->assignedTo = '指派给'; -$lang->testtask->linkVersion = '版本'; -$lang->testtask->lastRunAccount = '执行人'; -$lang->testtask->lastRunTime = '执行时间'; -$lang->testtask->lastRunResult = '结果'; -$lang->testtask->reportField = '测试总结'; -$lang->testtask->files = '上传附件'; -$lang->testtask->case = '用例'; -$lang->testtask->version = '版本'; -$lang->testtask->caseResult = '测试结果'; -$lang->testtask->stepResults = '步骤结果'; -$lang->testtask->lastRunner = '最后执行人'; -$lang->testtask->lastRunDate = '最后执行时间'; -$lang->testtask->date = '测试时间'; -$lang->testtask->deleted = "已删除"; -$lang->testtask->resultFile = "结果文件"; -$lang->testtask->caseCount = '用例数'; -$lang->testtask->passCount = '成功'; -$lang->testtask->failCount = '失败'; -$lang->testtask->summary = '有%s个用例，失败%s个，耗时%s。'; -$lang->testtask->pageSummary = '本页共 %s 个测试单。'; -$lang->testtask->allSummary = '本页共 %s 个测试单， 待测试测试单 %s， 测试中测试单 %s， 被阻塞测试单 %s。'; -$lang->testtask->checkedAllSummary = '共选中 %total% 个测试单， 待测试测试单 %wait%， 测试中测试单 %testing%， 被阻塞测试单 %blocked%。'; +$lang->testtask->id = '编号'; +$lang->testtask->common = '测试单'; +$lang->testtask->product = '所属' . $lang->productCommon; +$lang->testtask->project = '所属项目'; +$lang->testtask->execution = '所属' . $lang->execution->common; +$lang->testtask->type = '测试类型'; +$lang->testtask->build = '版本'; +$lang->testtask->owner = '负责人'; +$lang->testtask->executor = '执行人'; +$lang->testtask->execTime = '执行时间'; +$lang->testtask->pri = '优先级'; +$lang->testtask->name = '名称'; +$lang->testtask->begin = '开始日期'; +$lang->testtask->end = '结束日期'; +$lang->testtask->realFinishedDate = '实际完成日期'; +$lang->testtask->desc = '描述'; +$lang->testtask->mailto = '抄送给'; +$lang->testtask->status = '当前状态'; +$lang->testtask->subStatus = '子状态'; +$lang->testtask->testreport = '相关测试报告'; +$lang->testtask->assignedTo = '指派给'; +$lang->testtask->linkVersion = '版本'; +$lang->testtask->lastRunAccount = '执行人'; +$lang->testtask->lastRunTime = '执行时间'; +$lang->testtask->lastRunResult = '结果'; +$lang->testtask->reportField = '测试总结'; +$lang->testtask->files = '上传附件'; +$lang->testtask->case = '用例'; +$lang->testtask->version = '版本'; +$lang->testtask->caseResult = '测试结果'; +$lang->testtask->stepResults = '步骤结果'; +$lang->testtask->lastRunner = '最后执行人'; +$lang->testtask->lastRunDate = '最后执行时间'; +$lang->testtask->date = '测试时间'; +$lang->testtask->deleted = "已删除"; +$lang->testtask->resultFile = "结果文件"; +$lang->testtask->caseCount = '用例数'; +$lang->testtask->passCount = '成功'; +$lang->testtask->failCount = '失败'; +$lang->testtask->summary = '有%s个用例，失败%s个，耗时%s。'; +$lang->testtask->pageSummary = '本页共 %s 个测试单。'; +$lang->testtask->mySummary = '本页共 %s 个测试单，待测试测试单 %s，测试中测试单 %s，被阻塞测试单 %s。'; +$lang->testtask->allSummary = '本页共 %s 个测试单，待测试测试单 %s，测试中测试单 %s，被阻塞测试单 %s，已测测试单 %s。'; +$lang->testtask->checkedAllSummary = '共选中 %total% 个测试单，待测试测试单 %wait%，测试中测试单 %testing%，被阻塞测试单 %blocked%，，已测测试单 %done%。'; $lang->testtask->beginAndEnd = '起止时间'; $lang->testtask->to = '至'; diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php index eb65e3c4d5..7a83118728 100644 --- a/module/testtask/view/browse.html.php +++ b/module/testtask/view/browse.html.php @@ -90,11 +90,13 @@ $status = strtolower($status); $waitCount = 0; $testingCount = 0; $blockedCount = 0; + $doneCount = 0; ?> status == 'wait') $waitCount ++;?> status == 'doing') $testingCount ++;?> status == 'blocked') $blockedCount ++;?> + status == 'done') $doneCount ++;?> id"), sprintf('%03d', $task->id));?> id"), $task->name);?> @@ -119,7 +121,7 @@ $status = strtolower($status);
-
testtask->allSummary, count($tasks), $waitCount, $testingCount, $blockedCount) : sprintf($lang->testtask->pageSummary, count($tasks));?>
+
testtask->allSummary, count($tasks), $waitCount, $testingCount, $blockedCount, $doneCount) : sprintf($lang->testtask->pageSummary, count($tasks));?>
show('right', 'pagerjs');?>
diff --git a/module/user/view/testtask.html.php b/module/user/view/testtask.html.php index 6164fbb83a..d24fa5298b 100755 --- a/module/user/view/testtask.html.php +++ b/module/user/view/testtask.html.php @@ -41,11 +41,13 @@ $waitCount = 0; $testingCount = 0; $blockedCount = 0; + $doneCount = 0; ?> status == 'wait') $waitCount ++;?> status == 'doing') $testingCount ++;?> status == 'blocked') $blockedCount ++;?> + status == 'done') $doneCount ++;?> createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?> createLink('testtask', 'view', "taskID=$task->id"), $task->name);?> @@ -60,7 +62,7 @@
-
testtask->allSummary, count($tasks), $waitCount, $testingCount, $blockedCount);?>
+
testtask->allSummary, count($tasks), $waitCount, $testingCount, $blockedCount, $doneCount);?>
show('right', 'pagerjs');?>
From bafc9a60204645f5a6f65f73b3e76dc492739533 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 17 Oct 2022 13:54:11 +0800 Subject: [PATCH 3/9] * Fix bug #28528. --- module/task/css/edit.css | 2 +- module/task/js/edit.js | 1 + module/task/view/taskteam.html.php | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/module/task/css/edit.css b/module/task/css/edit.css index 9eee7f882d..8d0f467549 100644 --- a/module/task/css/edit.css +++ b/module/task/css/edit.css @@ -15,7 +15,7 @@ #taskTeamEditor tr td:first-child {width: 40px; position: relative;} .team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;} #taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;} -#taskTeamEditor tr:last-child td:first-child .icon {display: none;} +#taskTeamEditor tr:last-child td:first-child .icon, #taskTeamEditor tr.member-last td:first-child .icon {display: none;} #modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;} #modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;} diff --git a/module/task/js/edit.js b/module/task/js/edit.js index 9e93296521..b6ec50cd49 100644 --- a/module/task/js/edit.js +++ b/module/task/js/edit.js @@ -1,6 +1,7 @@ $(function() { $('.record-estimate-toggle').modalTrigger({width:900, type:'iframe', afterHide: function(){parent.location.href=parent.location.href;}}); + if(!newRowCount) $('#taskTeamEditor tr.member').last().addClass('member-last'); }) /** diff --git a/module/task/view/taskteam.html.php b/module/task/view/taskteam.html.php index 9e62015a66..601112122d 100644 --- a/module/task/view/taskteam.html.php +++ b/module/task/view/taskteam.html.php @@ -24,7 +24,7 @@ if($task->mode == 'linear' and strpos('|closed|cancel|pause|', $task->status) != $hourDisabled = $memberDisabled; if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = false; ?> - + @@ -55,7 +55,7 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal - + From f9b2fd0affa2193f374853a3d7ddf2c931fdb43b Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 17 Oct 2022 15:46:56 +0800 Subject: [PATCH 4/9] * Fix bug #28531. --- module/task/css/common.css | 14 ++++++++++++++ module/task/css/create.css | 13 ------------- module/task/css/edit.css | 13 ------------- module/task/view/taskteam.html.php | 11 +++++++++-- 4 files changed, 23 insertions(+), 28 deletions(-) diff --git a/module/task/css/common.css b/module/task/css/common.css index 6ac775e840..5c6be38e22 100644 --- a/module/task/css/common.css +++ b/module/task/css/common.css @@ -1,2 +1,16 @@ .body-modal > .main {padding: 20px;} .body-modal > .main .table-form {border: 1px solid #ddd;} + +#taskTeamEditor tr {padding: 8px 7px 8px 7px;} +#taskTeamEditor td .chosen-single .chosen-search input, +#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;} +#taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;} +#taskTeamEditor tr td:first-child {width: 40px; position: relative;} +.team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;} +#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;} +#taskTeamEditor tr:last-child td:first-child .icon, #taskTeamEditor tr.member-last td:first-child .icon {display: none;} + +#modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;} +#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;} +#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;} +#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;} diff --git a/module/task/css/create.css b/module/task/css/create.css index 676e62d8af..06d6b03211 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -33,16 +33,3 @@ #modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0;} #modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;} #modalTeam .modal-body {padding: 12px 13px 20px; max-height: 296px!important; overflow-y: scroll!important;} -#taskTeamEditor tr {padding: 8px 7px 8px 7px;} -#taskTeamEditor td .chosen-single .chosen-search input, -#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;} -#taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;} -#taskTeamEditor tr td:first-child {width: 40px; position: relative;} -.team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;} -#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;} -#taskTeamEditor tr:last-child td:first-child .icon {display: none;} - -#modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;} -#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;} -#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;} -#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;} diff --git a/module/task/css/edit.css b/module/task/css/edit.css index 8d0f467549..16a92a4e26 100644 --- a/module/task/css/edit.css +++ b/module/task/css/edit.css @@ -8,16 +8,3 @@ #modalTeam .modal-content {padding: 20px 13px 0; height: 340px;max-height: 296px!important; overflow-y: scroll!important;} #modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0; } #modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;} -#taskTeamEditor tr {padding: 8px 7px 8px 7px;} -#taskTeamEditor td .chosen-single .chosen-search input, -#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;} -#taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;} -#taskTeamEditor tr td:first-child {width: 40px; position: relative;} -.team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;} -#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;} -#taskTeamEditor tr:last-child td:first-child .icon, #taskTeamEditor tr.member-last td:first-child .icon {display: none;} - -#modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;} -#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;} -#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;} -#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;} diff --git a/module/task/view/taskteam.html.php b/module/task/view/taskteam.html.php index 601112122d..2c7995aad8 100644 --- a/module/task/view/taskteam.html.php +++ b/module/task/view/taskteam.html.php @@ -4,6 +4,7 @@ #taskTeamEditor .estimateBox input {background-color: #fff; border-right-width: 0px;} #taskTeamEditor input, #taskTeamEditor span, #taskTeamEditor .chosen-container > a {border-color: #eee;} +mode) or $task->mode == 'linear') ? '' : 'hidden';?> team)):?> team as $member):?> @@ -27,7 +28,7 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal - + account, "class='form-control chosen'" . ($memberDisabled ? ' disabled' : ''))?> @@ -58,7 +59,7 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal - + @@ -226,6 +227,10 @@ $(document).ready(function() { $newRow.removeClass('highlight'); }, 1600); + + var taskMode = $('#mode').val(); + if(taskMode == 'multi') $('#taskTeamEditor tr.member .icon-angle-down').addClass('hidden'); + disableMembers(); adjustButtons(); setLineNumber(); @@ -278,9 +283,11 @@ $(document).ready(function() if($(this).val() == 'multi') { disableMembers(); + $('#taskTeamEditor tr.member .icon-angle-down').addClass('hidden'); } else { + $('#taskTeamEditor tr.member .icon-angle-down').removeClass('hidden'); $taskTeamEditor.find('select#team').each(function() { $(this).find('option:disabled').removeAttr('disabled').trigger("chosen:updated"); From f4fdd2c3209ab4e65a1d345bd60581ecc7946713 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 17 Oct 2022 16:19:42 +0800 Subject: [PATCH 5/9] * Finish task #72323. --- module/productplan/view/browsebylist.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php index 425f8bf0a4..4321c91693 100644 --- a/module/productplan/view/browsebylist.html.php +++ b/module/productplan/view/browsebylist.html.php @@ -53,7 +53,7 @@

-
id&branch=$branch")?>'> + id&branch=$branch")?>' data-preserve-nested='true'> recTotal}&recPerPage={$pager->recPerPage}"; ?> From 4245745becd4c9c3e2dc6a8d6bfbcf8c3031a03b Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 17 Oct 2022 16:31:40 +0800 Subject: [PATCH 6/9] * Finish task #72351. --- module/block/view/buildblock.html.php | 4 ++-- module/execution/view/build.html.php | 4 ++-- module/project/view/build.html.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/block/view/buildblock.html.php b/module/block/view/buildblock.html.php index 3d44583e07..4c70762704 100644 --- a/module/block/view/buildblock.html.php +++ b/module/block/view/buildblock.html.php @@ -18,10 +18,10 @@ + - @@ -34,10 +34,10 @@ ?> > + - diff --git a/module/execution/view/build.html.php b/module/execution/view/build.html.php index 3f2e90bc4b..50bdd0dfb9 100644 --- a/module/execution/view/build.html.php +++ b/module/execution/view/build.html.php @@ -49,8 +49,8 @@ - + @@ -63,11 +63,11 @@ $build):?> - + diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php index 100e689765..2e1036655e 100644 --- a/module/project/view/build.html.php +++ b/module/project/view/build.html.php @@ -48,8 +48,8 @@ - + @@ -63,11 +63,11 @@ $build):?> - + From 016125ea7cfa3a8398f3363f2907acf8ad0b91c6 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 17 Oct 2022 16:55:39 +0800 Subject: [PATCH 7/9] * Finish task #72324. --- module/design/lang/de.php | 1 + module/design/lang/en.php | 1 + module/design/lang/fr.php | 1 + module/design/lang/zh-cn.php | 1 + module/design/view/browse.html.php | 12 ++++++------ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/module/design/lang/de.php b/module/design/lang/de.php index 8dc1c11869..17aa36a8ac 100644 --- a/module/design/lang/de.php +++ b/module/design/lang/de.php @@ -33,6 +33,7 @@ $lang->design->affectedStory = "{$lang->SRCommon}"; $lang->design->affectedTasks = 'Task'; $lang->design->reviewObject = 'Review Object'; $lang->design->createdBy = 'CreatedBy'; +$lang->design->createdByAB = 'CreatedBy'; $lang->design->createdDate = 'CreatedDate'; $lang->design->basicInfo = 'Basic Information'; $lang->design->noAssigned = 'Unassigned'; diff --git a/module/design/lang/en.php b/module/design/lang/en.php index f006c2c840..8c4c08019b 100644 --- a/module/design/lang/en.php +++ b/module/design/lang/en.php @@ -33,6 +33,7 @@ $lang->design->affectedStory = "{$lang->SRCommon}"; $lang->design->affectedTasks = 'Task'; $lang->design->reviewObject = 'Review Object'; $lang->design->createdBy = 'CreatedBy'; +$lang->design->createdByAB = 'CreatedBy'; $lang->design->createdDate = 'CreatedDate'; $lang->design->basicInfo = 'Basic Information'; $lang->design->noAssigned = 'Unassigned'; diff --git a/module/design/lang/fr.php b/module/design/lang/fr.php index 0e3e8da8a8..d202f002e6 100644 --- a/module/design/lang/fr.php +++ b/module/design/lang/fr.php @@ -33,6 +33,7 @@ $lang->design->affectedStory = "{$lang->SRCommon}"; $lang->design->affectedTasks = 'Task'; $lang->design->reviewObject = 'Review Object'; $lang->design->createdBy = 'CreatedBy'; +$lang->design->createdByAB = 'CreatedBy'; $lang->design->createdDate = 'CreatedDate'; $lang->design->basicInfo = 'Basic Information'; $lang->design->noAssigned = 'Unassigned'; diff --git a/module/design/lang/zh-cn.php b/module/design/lang/zh-cn.php index cab82e4748..63d05b8d68 100644 --- a/module/design/lang/zh-cn.php +++ b/module/design/lang/zh-cn.php @@ -33,6 +33,7 @@ $lang->design->affectedStory = "影响{$lang->SRCommon}"; $lang->design->affectedTasks = '影响任务'; $lang->design->reviewObject = '评审对象'; $lang->design->createdBy = '由谁创建'; +$lang->design->createdByAB = '创建者'; $lang->design->createdDate = '创建时间'; $lang->design->basicInfo = '基本信息'; $lang->design->noAssigned = '未指派'; diff --git a/module/design/view/browse.html.php b/module/design/view/browse.html.php index b3433abf73..6405b28ba9 100644 --- a/module/design/view/browse.html.php +++ b/module/design/view/browse.html.php @@ -32,12 +32,12 @@ recTotal}&recPerPage={$pager->recPerPage}";?> - - + - - + + + @@ -45,11 +45,11 @@ - + + - - + + + + @@ -68,6 +71,9 @@ + + +
idAB?>build->name;?> build->product;?> build->name;?> build->date;?>
id);?>name);?> productName);?> name);?> date?>
build->id;?>build->product;?> build->name;?>build->product;?> build->scmPath;?> build->filePath;?> build->date;?>
id"), sprintf('%03d', $build->id));?>productName;?> branchName) echo "{$build->branchName}"?> createLink('build', 'view', "build=$build->id"), $build->name);?> productName;?> scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath;?> filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?> date?>
build->id;?>build->product;?> build->name;?>build->product;?> executionCommon;?> build->scmPath;?> build->filePath;?>
id"), sprintf('%03d', $build->id), '', "data-app='project'");?>productName;?> branchName) echo "{$build->branchName}"?> createLink('build', 'view', "build=$build->id"), $build->name, '', "data-app='project'");?> productName;?> executionName;?> scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath;?> filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?>
design->id);?> design->type);?> idAB);?> design->name);?> design->createdBy);?> design->createdDate);?> design->type);?> design->assignedTo);?> design->createdByAB);?> design->createdDate);?> design->actions;?>
id);?> design->typeList, $design->type);?> createLink('design', 'view', "id={$design->id}"), $design->name) : $design->name;?> design->typeList, $design->type);?> design->printAssignedHtml($design, $users);?> createdBy);?> createdDate, 0, 11);?> design->printAssignedHtml($design, $users);?> id}"; From e05f1e7f89d026e42ea6be79480ce55989b285c5 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 17 Oct 2022 16:58:30 +0800 Subject: [PATCH 8/9] * Finish task #72374. --- module/doc/lang/de.php | 2 ++ module/doc/lang/en.php | 2 ++ module/doc/lang/fr.php | 2 ++ module/doc/lang/zh-cn.php | 2 ++ module/my/view/doc.html.php | 8 +++++++- 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php index 285060e931..96aaafdd24 100644 --- a/module/doc/lang/de.php +++ b/module/doc/lang/de.php @@ -61,9 +61,11 @@ $lang->doc->keywords = 'Tags'; $lang->doc->url = 'URL'; $lang->doc->files = 'Datei'; $lang->doc->addedBy = 'Angelegt von'; +$lang->doc->addedByAB = 'Added'; $lang->doc->addedDate = 'Angelegt am'; $lang->doc->editedBy = 'Bearbeitet von'; $lang->doc->editedDate = 'Bearbeitet am'; +$lang->doc->lastEditedBy = 'Last editor'; $lang->doc->version = 'Version'; $lang->doc->basicInfo = 'Basis Info'; $lang->doc->deleted = 'Gelöscht'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index db444b059f..75a91767a9 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -61,9 +61,11 @@ $lang->doc->keywords = 'Tags'; $lang->doc->url = 'URL'; $lang->doc->files = 'Files'; $lang->doc->addedBy = 'Author'; +$lang->doc->addedByAB = 'Added'; $lang->doc->addedDate = 'Added'; $lang->doc->editedBy = 'UpdatedBy'; $lang->doc->editedDate = 'Updated'; +$lang->doc->lastEditedBy = 'Last editor'; $lang->doc->version = 'Version'; $lang->doc->basicInfo = 'Basic Information'; $lang->doc->deleted = 'Deleted'; diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php index cb11214407..1a7bd4d533 100644 --- a/module/doc/lang/fr.php +++ b/module/doc/lang/fr.php @@ -61,9 +61,11 @@ $lang->doc->keywords = 'Tags'; $lang->doc->url = 'URL'; $lang->doc->files = 'Fichiers'; $lang->doc->addedBy = 'Auteur'; +$lang->doc->addedByAB = 'Added'; $lang->doc->addedDate = 'Ajouté le'; $lang->doc->editedBy = 'Màj par'; $lang->doc->editedDate = 'Màj le'; +$lang->doc->lastEditedBy = 'Last editor'; $lang->doc->version = 'Version'; $lang->doc->basicInfo = 'Infos de Base'; $lang->doc->deleted = 'Supprimé'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 35f81e9190..4aaa6f37e2 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -61,9 +61,11 @@ $lang->doc->keywords = '关键字'; $lang->doc->url = '文档URL'; $lang->doc->files = '附件'; $lang->doc->addedBy = '由谁添加'; +$lang->doc->addedByAB = '创建者'; $lang->doc->addedDate = '添加时间'; $lang->doc->editedBy = '由谁更新'; $lang->doc->editedDate = '更新时间'; +$lang->doc->lastEditedBy = '最后更新者'; $lang->doc->version = '版本号'; $lang->doc->basicInfo = '基本信息'; $lang->doc->deleted = '已删除'; diff --git a/module/my/view/doc.html.php b/module/my/view/doc.html.php index 8df4bcaf48..2fe0ba5be8 100644 --- a/module/my/view/doc.html.php +++ b/module/my/view/doc.html.php @@ -41,9 +41,12 @@ doc->object;?> doc->size;?> doc->addedBy;?>doc->addedByAB;?> doc->addedDate;?>doc->lastEditedBy;?> doc->editedDate;?> actions;?>
addedBy);?> addedDate, 'y-m-d');?>editedBy);?> editedDate, 'y-m-d');?> From bc72a89801f19f74048b4800015df7290ae3428b Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 17 Oct 2022 16:59:43 +0800 Subject: [PATCH 9/9] * Finish task #72374. --- module/doc/lang/de.php | 2 +- module/doc/lang/en.php | 2 +- module/doc/lang/fr.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php index 96aaafdd24..6a42fea1f2 100644 --- a/module/doc/lang/de.php +++ b/module/doc/lang/de.php @@ -65,7 +65,7 @@ $lang->doc->addedByAB = 'Added'; $lang->doc->addedDate = 'Angelegt am'; $lang->doc->editedBy = 'Bearbeitet von'; $lang->doc->editedDate = 'Bearbeitet am'; -$lang->doc->lastEditedBy = 'Last editor'; +$lang->doc->lastEditedBy = 'Last Editor'; $lang->doc->version = 'Version'; $lang->doc->basicInfo = 'Basis Info'; $lang->doc->deleted = 'Gelöscht'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 75a91767a9..5cd7cc5654 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -65,7 +65,7 @@ $lang->doc->addedByAB = 'Added'; $lang->doc->addedDate = 'Added'; $lang->doc->editedBy = 'UpdatedBy'; $lang->doc->editedDate = 'Updated'; -$lang->doc->lastEditedBy = 'Last editor'; +$lang->doc->lastEditedBy = 'Last Editor'; $lang->doc->version = 'Version'; $lang->doc->basicInfo = 'Basic Information'; $lang->doc->deleted = 'Deleted'; diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php index 1a7bd4d533..54651a1c76 100644 --- a/module/doc/lang/fr.php +++ b/module/doc/lang/fr.php @@ -65,7 +65,7 @@ $lang->doc->addedByAB = 'Added'; $lang->doc->addedDate = 'Ajouté le'; $lang->doc->editedBy = 'Màj par'; $lang->doc->editedDate = 'Màj le'; -$lang->doc->lastEditedBy = 'Last editor'; +$lang->doc->lastEditedBy = 'Last Editor'; $lang->doc->version = 'Version'; $lang->doc->basicInfo = 'Infos de Base'; $lang->doc->deleted = 'Supprimé';