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/api/v1/entries/execution.php
+1 -1
View File
@@ -75,7 +75,7 @@ class executionEntry extends entry
$execution->modules = $data->data->tree;
}
case 'builds':
$execution->builds = $this->loadModel('build')->getBuildPairs($productID, 'all', 'noempty,noterminate,nodone', $executionID, 'execution');
$execution->builds = $this->loadModel('build')->getBuildPairs(array($productID), 'all', 'noempty,noterminate,nodone', $executionID, 'execution');
break;
case 'moduleoptionmenu':
$execution->moduleOptionMenu = $this->loadModel('tree')->getTaskOptionMenu($executionID, 0, 0, 'allModule');
module/api/v1/entries/options.php
+1 -1
View File
@@ -36,7 +36,7 @@ class optionsEntry extends entry
if($product) $options['modules'] = $this->loadModel('tree')->getOptionMenu($product, 'bug');
$execution = $this->param('execution', 0);
$options['build'] = $this->loadModel('build')->getBuildPairs($product, 'all', '', $execution, 'execution');
$options['build'] = $this->loadModel('build')->getBuildPairs(array($product), 'all', '', $execution, 'execution');
break;
}
module/api/v1/entries/product.php
+1 -1
View File
@@ -66,7 +66,7 @@ class productEntry extends entry
$product->parentstories= $this->loadModel('story')->getParentStoryPairs($productID);
break;
case 'builds':
$product->builds = $this->loadModel('build')->getBuildPairs($productID, 'all', 'noempty,noterminate,nodone,withbranch', $this->param('object', 0), $this->param('objectType', 'execution'));
$product->builds = $this->loadModel('build')->getBuildPairs(array($productID), 'all', 'noempty,noterminate,nodone,withbranch', $this->param('object', 0), $this->param('objectType', 'execution'));
break;
case 'actions':
$product->addComment = common::hasPriv('action', 'comment') ? true : false;
module/api/v1/entries/testtasks.php
+1 -1
View File
@@ -87,7 +87,7 @@ class testtasksEntry extends entry
/* Check whether executionID and buildID is valid. */
$executions = $this->loadModel('product')->getExecutionPairsByProduct($productID, '', $projectID);
$builds = $this->loadModel('build')->getBuildPairs($productID, 'all', 'notrunk');
$builds = $this->loadModel('build')->getBuildPairs(array($productID), 'all', 'notrunk');
if(!isset($executions[$executionID])) return $this->sendError(400, 'error execution id!');
if(!isset($builds[$buildID])) return $this->sendError(400, 'error build id!');