From 8aaf69541b25102f6a2cc8c039d3afedeb7b4b03 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Tue, 5 Mar 2024 13:26:08 +0800 Subject: [PATCH] * Adjust testcase status for story changed. --- module/testcase/ui/browse.html.php | 2 ++ module/testcase/ui/view.html.php | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/module/testcase/ui/browse.html.php b/module/testcase/ui/browse.html.php index 58511a9c9c..e6dd301b6e 100644 --- a/module/testcase/ui/browse.html.php +++ b/module/testcase/ui/browse.html.php @@ -109,6 +109,7 @@ if(isset($cols['title'])) $cols['title']['nestedToggle'] = $topSceneCount > 0; if(isset($cols['branch'])) $cols['branch']['map'] = $branchTagOption; if(isset($cols['story'])) $cols['story']['map'] = $stories; if(isset($cols['scene'])) $cols['scene']['map'] = $iscenes; +$cols['status']['statusMap']['changed'] = $lang->story->changed; foreach($cases as $case) { @@ -118,6 +119,7 @@ foreach($cases as $case) $cols['actions']['menu'] = $config->$actionType->menu; if($actionType == 'testcase' && !$this->config->testcase->needReview) unset($cols['actions']['menu'][1][0]); if($actionType == 'scene') $case->bugs = $case->results = $case->stepNumber = $case->version = ''; + if($case->needconfirm) $case->status = 'changed'; $case->browseType = $browseType; initTableData(array($case), $cols, $this->testcase); diff --git a/module/testcase/ui/view.html.php b/module/testcase/ui/view.html.php index 71b3a5444a..f95b407997 100644 --- a/module/testcase/ui/view.html.php +++ b/module/testcase/ui/view.html.php @@ -192,11 +192,17 @@ else if($case->story && $case->storyStatus == 'active' && $case->latestStoryVersion > $case->storyVersion) { $confirmStatusChange = span - ( - setClass('warning'), - $lang->story->changed, - common::hasPriv('testcase', 'confirmStoryChange', $case) ? a(set::href($this->createLink('testcase', 'confirmStoryChange', "caseID={$case->id}")), setData('app', $app->tab), $lang->confirm) : '' - ); + ( + '(', + $lang->story->changed, + common::hasPriv('testcase', 'confirmStoryChange', $case) ? a( + set::href($this->createLink('testcase', 'confirmStoryChange', "caseID={$case->id}")), + setData('app', $app->tab), + setClass('mx-1'), + $lang->confirm + ) : '', + ')' + ); } $storyItem = item (