This commit is contained in:
tanghucheng
2024-01-18 18:18:36 +08:00
parent 1dd92df6fe
commit 73c0f94b50
3 changed files with 13 additions and 0 deletions
+3
View File
@@ -7026,6 +7026,7 @@ class storyModel extends model
$storyIDList = array();
foreach($objects as $object)
{
if($this->app->rawModule == 'testtask') $object->id = $object->case;
$objectIDList[] = $object->id;
if($objectType == 'story') $storyIDList[] = $object->id;
if($objectType != 'story') $storyIDList[] = $object->story;
@@ -7067,6 +7068,8 @@ class storyModel extends model
foreach($objects as $object)
{
$confirmed = array();
if($this->app->rawModule == 'testtask') $object->id = $object->case;
if(isset($actions[$object->id])) $confirmed = $actions[$object->id]; // 已经确认的用户需求
if($objectType == 'story' and isset($confirmObjects[$object->id]))
+3
View File
@@ -562,9 +562,12 @@ class testtask extends control
/* Get test cases. */
$runs = $this->testtask->getTaskCases($productID, $browseType, $queryID, $moduleID, $sort, $pager, $task);
if($this->config->edition == 'ipd') $runs = $this->loadModel('story')->getAffectObject($runs, 'case');
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
$runs = $this->loadModel('story')->checkNeedConfirm($runs);
$case2RunMap = array();
foreach($runs as $run) $case2RunMap[$run->case] = $run->id;
+7
View File
@@ -1965,6 +1965,13 @@ class testtaskModel extends model
break;
case 'actions':
if($isScene) break;
if(!empty($run->retractConfirm))
{
$retractObject = join(',', $run->retractObject);
common::printIcon('testcase', 'confirmDemandRetract', "objectID=$run->case&object=case&extra=$retractObject", $run, 'list', 'search', '', 'iframe', true);
break;
}
if($run->caseStatus != 'wait' and $caseChanged)
{
common::printIcon('testcase', 'confirmChange', "id=$run->case&taskID=$run->task&from=list", $run, 'list', 'search', 'hiddenwin');