From 0b309f63bd0bf4657c354b20e3b736d97ceb2832 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Mon, 4 Jul 2022 08:54:44 +0000 Subject: [PATCH] * Finish task #59534 #59530 #59529. --- module/execution/view/testcase.html.php | 2 +- module/execution/view/testtask.html.php | 2 +- module/my/view/testtask.html.php | 2 +- module/project/view/testtask.html.php | 2 +- module/story/css/track.css | 2 +- module/story/view/track.html.php | 2 +- module/testcase/model.php | 2 +- module/testtask/model.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module/execution/view/testcase.html.php b/module/execution/view/testcase.html.php index 56ef3d6e4e..908ad4c967 100644 --- a/module/execution/view/testcase.html.php +++ b/module/execution/view/testcase.html.php @@ -52,7 +52,7 @@ testcase->typeList, $case->type);?> openedBy);?> lastRunner);?> - lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> + lastRunDate)) echo substr($case->lastRunDate, 5, 11);?> lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> id", $task, 'list', 'link'); if(common::hasPriv('execution', 'testreport')) { - echo html::a($this->createLink('execution', 'testreport', "executionID=$executionID&objctType=execution&extra=$task->id"), '', '', 'class="btn " title="' . $lang->testreport->browse . '" data-app="execution"'); + echo html::a($this->createLink('execution', 'testreport', "executionID=$executionID&objctType=execution&extra=$task->id"), '', '', 'class="btn " title="' . $lang->testreport->browse . '" data-app="execution"'); } common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list'); common::printIcon('testtask', 'delete', "taskID=$task->id", $task, 'list', 'trash', 'hiddenwin'); diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index 7a07dd9a4e..4c7e9b1a19 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -58,7 +58,7 @@ common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'list', 'sitemap', '', '', '', "data-app='qa'"); common::printIcon('testtask', 'view', "taskID=$task->id", '', 'list', 'list-alt', '', 'iframe', true, "data-width='90%'"); common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link', '', '', false, "data-app='qa'"); - common::printIcon('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list', 'flag', '', '', false, "data-app='qa'"); + common::printIcon('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list', 'summary', '', '', false, "data-app='qa'"); common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, "data-width='90%'"); if(common::hasPriv('testtask', 'delete', $task)) { diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php index 2767c461f3..bae7bc849e 100644 --- a/module/project/view/testtask.html.php +++ b/module/project/view/testtask.html.php @@ -94,7 +94,7 @@ common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link'); if(common::hasPriv('execution', 'testreport') and $project->model == 'scrum') { - echo html::a($this->createLink('execution', 'testreport', "executionID=$task->execution&objectType=execution&extra=$task->id"), '', '', 'class="btn " title="' . $lang->testreport->browse . '" data-app="project"'); + echo html::a($this->createLink('execution', 'testreport', "executionID=$task->execution&objectType=execution&extra=$task->id"), '', '', 'class="btn " title="' . $lang->testreport->browse . '" data-app="project"'); } common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list'); common::printIcon('testtask', 'delete', "taskID=$task->id", $task, 'list', 'trash', 'hiddenwin'); diff --git a/module/story/css/track.css b/module/story/css/track.css index 7408dc06fc..65b38983a4 100644 --- a/module/story/css/track.css +++ b/module/story/css/track.css @@ -1 +1 @@ -.table td {text-align: center;} +.table td {text-align: left;} diff --git a/module/story/view/track.html.php b/module/story/view/track.html.php index 54c5a4aea8..7522484fd5 100644 --- a/module/story/view/track.html.php +++ b/module/story/view/track.html.php @@ -23,7 +23,7 @@
- + URAndSR):?>
> app->rawModule == 'projectstory'): ?> diff --git a/module/testcase/model.php b/module/testcase/model.php index 169ab985b3..2fd9fb21a1 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -2025,7 +2025,7 @@ class testcaseModel extends model echo zget($users, $case->lastRunner); break; case 'lastRunDate': - if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate)); + if(!helper::isZeroDate($case->lastRunDate)) echo substr($case->lastRunDate, 5, 11); break; case 'lastRunResult': $class = 'result-' . $case->lastRunResult; diff --git a/module/testtask/model.php b/module/testtask/model.php index 795fa22d6a..5366c9f16c 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -2278,7 +2278,7 @@ class testtaskModel extends model $menu .= '
'; $menu .= $this->buildMenu('testtask', 'cases', $params, $task, 'browse', 'sitemap'); $menu .= $this->buildMenu('testtask', 'linkCase', "$params&type=all¶m=myQueryID", $task, 'browse', 'link'); - $menu .= $this->buildMenu('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'browse', 'flag'); + $menu .= $this->buildMenu('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'browse', 'summary'); $menu .= '
'; $menu .= $this->buildMenu('testtask', 'view', $params, $task, 'browse', 'list-alt', '', 'iframe', true, "data-width='90%'"); $menu .= $this->buildMenu('testtask', 'edit', $params, $task, 'browse');