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

* Compatible with argument type for calling the getBuildPairs method.

Browse Source
This commit is contained in:
tianshujie
2023-09-27 11:03:36 +08:00
parent c09f7a7380
commit be396507c7
20 changed files with 61 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+2 -2
View File
@@ -945,7 +945,7 @@ class testtask extends control
$this->view->runID = $runID;
$this->view->results = $results;
$this->view->type = $type;
$this->view->builds = $this->loadModel('build')->getBuildPairs($case->product, $case->branch);
$this->view->builds = $this->loadModel('build')->getBuildPairs(array($case->product), $case->branch);
$this->view->users = $this->loadModel('user')->getPairs('noclosed, noletter');
$this->view->testtasks = $this->testtask->getPairs($case->product);
@@ -997,7 +997,7 @@ class testtask extends control
$this->loadModel('qa')->setMenu($productID);
$executions = empty($productID) ? array() : $this->product->getExecutionPairsByProduct($productID);
$builds = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs($productID, 'all', 'notrunk', 0, 'execution', '', false);
$builds = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs(array($productID), 'all', 'notrunk', 0, 'execution', '', false);
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->importUnitResult;
$this->view->users = $this->loadModel('user')->getPairs('noletter|nodeleted|noclosed');
module/testtask/zen.php
+2 -2
View File
@@ -319,7 +319,7 @@ class testtaskZen extends testtask
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->create;
$this->view->product = $this->loadModel('product')->getByID($productID);
$this->view->executions = $productID ? $this->product->getExecutionPairsByProduct($productID, '', $projectID, 'stagefilter') : array();
$this->view->builds = $productID ? $this->loadModel('build')->getBuildPairs($productID, 'all', 'notrunk,withexecution', $projectID, 'project', '', false) : array();
$this->view->builds = $productID ? $this->loadModel('build')->getBuildPairs(array($productID), 'all', 'notrunk,withexecution', $projectID, 'project', '', false) : array();
$this->view->testreports = array('') + $this->loadModel('testreport')->getPairs($productID);
$this->view->users = $this->loadModel('user')->getPairs('noclosed|qdfirst|nodeleted');
$this->view->projectID = $projectID;
@@ -359,7 +359,7 @@ class testtaskZen extends testtask
$this->view->project = $this->project->getByID($projectID);
$this->view->productID = $productID;
$this->view->executions = $executions;
$this->view->builds = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs($productID, 'all', 'noempty,notrunk,withexecution', $executionID ? $executionID : $task->project, $executionID ? 'execution' : 'project', $task->build, false);
$this->view->builds = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs(array($productID), 'all', 'noempty,notrunk,withexecution', $executionID ? $executionID : $task->project, $executionID ? 'execution' : 'project', $task->build, false);
$this->view->testreports = $this->loadModel('testreport')->getPairs($task->product, $task->testreport);
$this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed', $task->owner);
$this->view->contactLists = $this->user->getContactLists($this->app->user->account, 'withnote');