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

Merge branch dev/bug-62871 of zentao/zentaopms (#8971)

Browse Source
This commit is contained in:
刘刚
2025-05-28 15:44:45 +08:00
committed by Gitfox
parent ad907ab65b 38ab2a5b86
commit b76a9461ba
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+1 -1
View File
@@ -4172,7 +4172,7 @@ class executionModel extends model
}
else
{
$this->config->execution->search['params']['execution']['values'] = $showAll ? $executions : array(''=>'', $executionID => $executions[$executionID], 'all' => $this->lang->execution->allExecutions);
$this->config->execution->search['params']['execution']['values'] = $showAll ? $executions : array(''=>'', $executionID => zget($executions, $executionID, ''), 'all' => $this->lang->execution->allExecutions);
}
$projects = $this->loadModel('project')->getPairsByProgram();
module/execution/test/model/buildtasksearchform.php
+7 -5
View File
@@ -44,18 +44,20 @@ title=测试executionModel->buildTaskSearchFrom();
cid=1
pid=1
正确的执行，正确的queryID >> 1
错误的执行，正确的queryID >> 1
正确的执行，错误的queryID >> 0
错误的执行，错误的queryID >> 0
- 正确的执行，正确的queryID @1
- 错误的执行，正确的queryID @1
- 正确的执行，错误的queryID @0
- 错误的执行，错误的queryID @0
- 正确的执行，正确的queryID @2
*/
$executionIDList = array('3', '0');
$queryIDList = array('0', '1');
$queryIDList = array('0', '1', '2');
$execution = new executionTest();
r($execution->buildTaskSearchFormTest($executionIDList[0], $queryIDList[1])) && p() && e('1'); // 正确的执行，正确的queryID
r($execution->buildTaskSearchFormTest($executionIDList[1], $queryIDList[1])) && p() && e('1'); // 错误的执行，正确的queryID
r($execution->buildTaskSearchFormTest($executionIDList[0], $queryIDList[0])) && p() && e('0'); // 正确的执行，错误的queryID
r($execution->buildTaskSearchFormTest($executionIDList[1], $queryIDList[0])) && p() && e('0'); // 错误的执行，错误的queryID
r($execution->buildTaskSearchFormTest($executionIDList[1], $queryIDList[2])) && p() && e('2'); // 正确的执行，正确的queryID