From 91bb5e7cfe5a4b23662ba363605e71f1490f0a51 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 20 May 2024 13:43:10 +0800 Subject: [PATCH] * Fix bug #49753. --- module/execution/ui/testcase.html.php | 2 +- module/testcase/ui/browse.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/execution/ui/testcase.html.php b/module/execution/ui/testcase.html.php index 712fdd018d..cbb36d1b3f 100644 --- a/module/execution/ui/testcase.html.php +++ b/module/execution/ui/testcase.html.php @@ -41,7 +41,7 @@ if(isset($config->testcase->dtable->fieldList['story'])) $config->testcase->dta if(isset($config->testcase->dtable->fieldList['scene'])) $config->testcase->dtable->fieldList['scene']['map'] = $scenes; $config->testcase->dtable->fieldList['actions']['list']['edit']['url'] = str_replace('%executionID%', (string)$executionID, $config->testcase->dtable->fieldList['actions']['list']['edit']['url']); $config->testcase->dtable->fieldList['actions']['menu'] = array(array('confirmStoryChange'), array('runCase|ztfRun', 'runResult', 'edit', 'createBug', 'create')); -if($config->testcase->needReview) array_unshift($config->testcase->dtable->fieldList['actions']['menu'][1], 'review'); +if($config->testcase->needReview || !empty($config->testcase->forceReview)) array_unshift($config->testcase->dtable->fieldList['actions']['menu'][1], 'review'); $this->config->testcase->dtable->fieldList['title']['link'] = array('module' => 'testcase', 'method' => 'view', 'params' => "caseID={id}"); $this->config->testcase->dtable->fieldList['bugs']['link'] = array('module' => 'testcase', 'method' => 'bugs', 'params' => "runID=0&caseID={id}"); foreach($config->testcase->dtable->fieldList['actions']['list'] as $method => $action) diff --git a/module/testcase/ui/browse.html.php b/module/testcase/ui/browse.html.php index 8f8e60b42b..d7e62ef102 100644 --- a/module/testcase/ui/browse.html.php +++ b/module/testcase/ui/browse.html.php @@ -118,7 +118,7 @@ foreach($cases as $case) $actionType = $case->isScene ? 'scene' : 'testcase'; $cols['actions']['menu'] = $config->$actionType->menu; - if($actionType == 'testcase' && !$this->config->testcase->needReview) unset($cols['actions']['menu'][1][0]); + if($actionType == 'testcase' && !$this->config->testcase->needReview && empty($config->testcase->forceReview)) unset($cols['actions']['menu'][1][0]); if($actionType == 'scene') $case->bugs = $case->results = $case->stepNumber = $case->version = ''; if(!empty($case->needconfirm)) $case->status = 'changed';