From 9d6646cc7d77f37e41bfde358e34188778f83841 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 27 Oct 2022 14:01:53 +0800 Subject: [PATCH 1/9] * Add bug list style. --- module/my/view/bug.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index 599914d144..c70786201d 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -113,7 +113,7 @@ createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color' title='{$bug->title}'");?> case) echo html::a(helper::createLink('testcase', 'view', "caseID=$bug->case&version=$bug->caseVersion"), "[" . $this->lang->testcase->common . "#$bug->case]", '', "class='bug' title='$bug->case'");?> - + ' title='bug->severityList, $bug->severity);?>' data-severity='severity;?>'>bug->severityList, $bug->severity, $bug->severity);?> From 6ea03bf061d30197ba08c8e21b75c9dc1b5a56ed Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 27 Oct 2022 14:04:45 +0800 Subject: [PATCH 2/9] * Fix bug #29034. --- www/theme/default/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 7a95699b6f..ca2a8cea02 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -176,7 +176,7 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline- .status-reviewing .label-dot {background-color: #18A6FD;} .status-cancel, .status-investigate, .status-canceled {color: #838A9D;} .status-active .label-dot, .status-wait .label-dot {background-color: #313C52;} -.status-doing, .status-commenting, .status-checking, .status-confirmed {color: #FF6F42;} +.status-doing, .status-commenting, .status-checking, .status-confirmed, .status-issue.status-active {color: #FF6F42;} .status-closed, #workflowTable td.text-center.text-muted, .status-testtask.status-done {color: #9EA3B0;} .status-suspended, .status-pause, .status-blocked, .status-hangup, .result-testcase.blocked, .c-lastRunResult .result-blocked {color: #B89664;} .status-done, .status-resolved, .status-replied, .status-checked, #workflowTable td.text-success, .result-testcase.pass, .c-lastRunResult .result-pass {color: #0DBB7D;} From 766f3a97c7347b15fcba936e39beb8d94997f795 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 27 Oct 2022 14:09:34 +0800 Subject: [PATCH 3/9] * Modify page style. --- module/testcase/css/browse.css | 1 + 1 file changed, 1 insertion(+) diff --git a/module/testcase/css/browse.css b/module/testcase/css/browse.css index e8ef272860..b0e70a9c5d 100644 --- a/module/testcase/css/browse.css +++ b/module/testcase/css/browse.css @@ -24,3 +24,4 @@ tbody > tr > td .icon-share {font-size: 9px;} #importToLib .select-lib {width: 100px; text-align: right;} #subHeader #currentBranch + #dropMenu .col-left {padding-bottom: 30px;} +.status-blocked {left: -5px;} From 536c37c92f7b9f919da82e01d16b210cbc5e4266 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 27 Oct 2022 14:10:51 +0800 Subject: [PATCH 4/9] * Fix bug #28987. --- module/testcase/view/view.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 087aea52c4..f86335f40e 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -248,7 +248,7 @@ testcase->status;?> - + processStatus('testcase', $case); if($case->version > $case->currentVersion and $from == 'testtask') From ca2095505e114fcdaa6de1d5fd9b0769af013186 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 27 Oct 2022 14:29:14 +0800 Subject: [PATCH 5/9] * Fix bug #29030. --- module/product/view/dashboard.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/product/view/dashboard.html.php b/module/product/view/dashboard.html.php index 7223110f13..bb344110ce 100644 --- a/module/product/view/dashboard.html.php +++ b/module/product/view/dashboard.html.php @@ -54,7 +54,7 @@
From 467f1ba3e1b9d89c74539b77f9518a9bfa82095b Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 27 Oct 2022 14:33:04 +0800 Subject: [PATCH 6/9] * Modify todo page style. --- module/user/view/todo.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php index d578a81040..fbcd23784c 100644 --- a/module/user/view/todo.html.php +++ b/module/user/view/todo.html.php @@ -58,9 +58,9 @@ private and $this->app->user->account != $todo->account) ? $todo->name : html::a($this->createLink('todo', 'view', "id=$todo->id&from=company", '', true), $todo->name, '', "class='iframe'");?> - todo->priList, $todo->pri, $todo->pri);?>'>todo->priList, $todo->pri, $todo->pri);?> + todo->priList, $todo->pri, $todo->pri);?>'>todo->priList, $todo->pri, $todo->pri);?> date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?> - todo->statusList[$todo->status];?> + todo->statusList[$todo->status];?> todo->typeList[$todo->type];?> begin;?> end;?> From 0cbf110be273bdcca2f7ce735cba49a9c42083e7 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 27 Oct 2022 15:37:49 +0800 Subject: [PATCH 7/9] * Fix bug #29047. --- module/testtask/view/results.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php index 37e3905a72..5a42bb201a 100644 --- a/module/testtask/view/results.html.php +++ b/module/testtask/view/results.html.php @@ -47,7 +47,7 @@ date;?> lastRunner) . ' ' . $lang->testtask->runCase;?> build, '');?> - testcase->resultList[$result->caseResult]?> + testcase->resultList[$result->caseResult]?> files)) echo html::a("#caseResult{$result->id}", $lang->files . $fileCount, '', "data-toggle='modal' data-type='iframe'")?> From da590b7a278d36cd40c64be0a8e20080a08015a9 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 27 Oct 2022 15:40:08 +0800 Subject: [PATCH 8/9] * Fix bug #29049. --- module/testsuite/view/view.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php index bf0c2557eb..506736298b 100644 --- a/module/testsuite/view/view.html.php +++ b/module/testsuite/view/view.html.php @@ -86,8 +86,8 @@ createLink('testcase', 'view', "caseID=$case->id&version=$case->caseVersion"), $case->title);?> testcase->typeList[$case->type];?> - version < $case->caseVersion) ? "{$lang->testcase->changed}" : $this->processStatus('testcase', $case);?> - lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> + version < $case->caseVersion) ? "{$lang->testcase->changed}" : $this->processStatus('testcase', $case);?> + lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> bugs) ? html::a($this->createLink('testcase', 'bugs', "runID=0&caseID={$case->id}"), $case->bugs, '', "class='iframe'") : $case->bugs;?> results) ? html::a($this->createLink('testtask', 'results', "runID=0&caseID={$case->id}"), $case->results, '', "class='iframe'") : $case->results;?> stepNumber;?> From b16ad73ebc99e5b241b1b8a9ed0e275950a2b142 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 27 Oct 2022 15:47:24 +0800 Subject: [PATCH 9/9] * Adjust code. --- module/product/view/dashboard.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/product/view/dashboard.html.php b/module/product/view/dashboard.html.php index bb344110ce..dbc184007a 100644 --- a/module/product/view/dashboard.html.php +++ b/module/product/view/dashboard.html.php @@ -54,7 +54,7 @@