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

* [bug#67927] Fix parameter type error.

Browse Source
This commit is contained in:
liugang
2025-12-10 16:36:39 +08:00
parent 4b4cc7333e
commit bf538a930e
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/model.php
+5 -4
View File
@@ -260,14 +260,15 @@ class buildModel extends model
* @access public
* @return array
*/
public function getBuildPairs(array|int $productIdList, string|int $branch = 'all', string $params = 'noterminate, nodone', int $objectID = 0, string $objectType = 'execution', string $buildIdList = '', bool $replace = true, int $system = 0): array
public function getBuildPairs(array|int $productIdList, string|int $branch = 'all', string $params = 'noterminate, nodone', int $objectID = 0, string $objectType = 'execution', string|int $buildIdList = '', bool $replace = true, int $system = 0): array
{
if(common::isTutorialMode()) return $this->loadModel('tutorial')->getBuildPairs();
$sysBuilds = array();
if(strpos($params, 'notrunk') === false) $sysBuilds = array('trunk' => $this->lang->trunk);
$buildIdList = str_replace('trunk', '0', $buildIdList);
if(is_string($buildIdList)) $buildIdList = str_replace('trunk', '0', $buildIdList);
$shadows = array();
if(!empty($productIdList)) $shadows = $this->dao->select('shadow')->from(TABLE_RELEASE)->where('product')->in($productIdList)->fetchPairs('shadow', 'shadow'); // Get the buildID under the shadow product.
if($objectType == 'project') $shadows = $this->dao->select('shadow')->from(TABLE_RELEASE)->where("FIND_IN_SET({$objectID}, project)")->fetchPairs('shadow', 'shadow');
@@ -418,7 +419,7 @@ class buildModel extends model
* Get releated release.
*
* @param array|int $productIdList
* @param string $buildIdList
* @param string|int $buildIdList
* @param array|bool $shadows
* @param string $objectType
* @param int $objectID
@@ -426,7 +427,7 @@ class buildModel extends model
* @access public
* @return array
*/
public function getRelatedReleases(array|int $productIdList, string $buildIdList = '', array|bool $shadows = false, string $objectType = '', int $objectID = 0, string $params = ''): array
public function getRelatedReleases(array|int $productIdList, string|int $buildIdList = '', array|bool $shadows = false, string $objectType = '', int $objectID = 0, string $params = ''): array
{
$releases = $this->dao->select('DISTINCT t1.id,t1.shadow,t1.product,t1.branch,t1.build,t1.name,t1.date,t1.status,t3.name as branchName,t4.type as productType')->from(TABLE_RELEASE)->alias('t1')
->leftJoin(TABLE_RELEASERELATED)->alias('t5')->on("t1.id=t5.release AND t5.objectType='build'")
module/build/tao.php
+6 -6
View File
@@ -53,15 +53,15 @@ class buildTao extends buildModel
* 获取项目、执行关联的版本信息。
* Get the builds that the project,execution has been linked.
*
* @param string $buildIdList
* @param array|int $productIdList
* @param string $params hasdeleted
* @param int $objectID
* @param string $objectType
* @param string|int $buildIdList
* @param array|int $productIdList
* @param string $params hasdeleted
* @param int $objectID
* @param string $objectType
* @access protected
* @return array
*/
protected function selectedBuildPairs(string $buildIdList, array|int $productIdList, string $params, int $objectID, string $objectType): array
protected function selectedBuildPairs(string|int $buildIdList, array|int $productIdList, string $params, int $objectID, string $objectType): array
{
$selectedBuilds = array();
if($buildIdList)