Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [bug#64376,done,0.5h] fix bug.

Browse Source
This commit is contained in:
sunguangming
2025-08-06 15:22:13 +08:00
committed by tianshujie
parent d4ddff333d
commit 32f805fee6
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/model.php
+21 -5
View File
@@ -824,10 +824,15 @@ class testtaskModel extends model
$caseIdList = array_unique(array_filter(array_map(function($run){return $run->case;}, $runs)));
if($type == 'bybuild' && $caseIdList) $users = $this->dao->select('`case`, assignedTo')->from(TABLE_TESTRUN)->where('`case`')->in($caseIdList)->fetchPairs();
if($this->app->tab != 'qa')
if($this->app->tab == 'execution')
{
$projectID = $this->app->tab == 'project' ? $this->session->project : $this->session->execution;
$lastOrder = $this->dao->select('MAX(`order`) AS `order`')->from(TABLE_PROJECTCASE)->where('project')->eq($projectID)->fetch('order');
$execution = $this->loadModel('execution')->fetchByID((int)$this->session->execution);
$executionLastOrder = $this->dao->select('MAX(`order`) AS `order`')->from(TABLE_PROJECTCASE)->where('project')->eq((int)$execution->id)->fetch('order');
$projectLastOrder = $this->dao->select('MAX(`order`) AS `order`')->from(TABLE_PROJECTCASE)->where('project')->eq((int)$execution->project)->fetch('order');
}
elseif($this->app->tab == 'project')
{
$lastOrder = $this->dao->select('MAX(`order`) AS `order`')->from(TABLE_PROJECTCASE)->where('project')->eq((int)$this->session->project)->fetch('order');
}
$case = new stdclass();
@@ -844,13 +849,24 @@ class testtaskModel extends model
/* 在项目或执行下关联用例到测试单时把用例关联到项目或执行。*/
/* Associate the cases to the project or execution when associating the cases to the testtask under the project or execution. */
if($this->app->tab != 'qa')
if($this->app->tab == 'project')
{
$case->project = $projectID;
$case->project = (int)$this->session->project;
$case->case = $run->case;
$case->order = ++$lastOrder;
$this->dao->replace(TABLE_PROJECTCASE)->data($case)->exec();
}
elseif($this->app->tab == 'execution')
{
$case->project = (int)$execution->id;
$case->case = $run->case;
$case->order = ++$executionLastOrder;
$this->dao->replace(TABLE_PROJECTCASE)->data($case)->exec();
$case->project = (int)$execution->project;
$case->order = ++$projectLastOrder;
$this->dao->replace(TABLE_PROJECTCASE)->data($case)->exec();
}
$this->action->create('case', $run->case, 'linked2testtask', '', $taskID);
}