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

* [bug#60297,done,1h] fix bug.

Browse Source
This commit is contained in:
sunguangming
2025-03-06 14:47:11 +08:00
committed by 田淑杰
parent 0bcdd9c554
commit 8db179f7b0
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/zen.php
+1 -1
View File
@@ -995,7 +995,7 @@ class bugZen extends bug
if(!empty($bug->allBuilds))
{
$builds = $this->build->getBuildPairs(array($productID), $branch, 'noempty,noterminate,nodone,withbranch,noreleased,nofail', 0, '');
$builds = $this->build->getBuildPairs(array($productID), $branch, 'noempty,noterminate,nodone,withbranch,noreleased,noreplace', 0, '');
}
elseif($executionID)
{
module/build/control.php
+1 -1
View File
@@ -235,7 +235,7 @@ class build extends control
$isJsonView = $this->app->getViewType() == 'json';
if($varName == 'openedBuild' )
{
$params = $type == 'all' ? 'withbranch,noreleased,nofail' : 'noterminate,nodone,withbranch,noreleased';
$params = $type == 'all' ? 'withbranch,noreleased,noreplace' : 'noterminate,nodone,withbranch,noreleased';
$builds = $this->build->getBuildPairs(array($productID), $branch, $params, 0, 'project', $build);
if($isJsonView) return print(json_encode($builds));
module/build/model.php
+8 -5
View File
@@ -392,11 +392,14 @@ class buildModel extends model
if(strpos($params, 'releasetag') !== false) $releaseName = $releaseName . " [{$this->lang->build->released}]";
$builds[$release->date][$release->shadow] = $releaseName;
foreach(explode(',', trim($release->build, ',')) as $buildID)
if(strpos($params, 'noreplace') === false) // 勾选所有版本时，展示所有发布，不替换版本名称。
{
if(!isset($allBuilds[$buildID])) continue;
$build = $allBuilds[$buildID];
if(strpos($params, 'noreleased') !== false) unset($builds[$build->date][$buildID]);
foreach(explode(',', trim($release->build, ',')) as $buildID)
{
if(!isset($allBuilds[$buildID])) continue;
$build = $allBuilds[$buildID];
if(strpos($params, 'noreleased') !== false) unset($builds[$build->date][$buildID]);
}
}
}
@@ -418,7 +421,7 @@ class buildModel extends model
*/
public function getRelatedReleases(array|int $productIdList, string $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,t3.name as branchName,t4.type as productType')->from(TABLE_RELEASE)->alias('t1')
$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'")
->leftJoin(TABLE_BUILD)->alias('t2')->on('t5.objectID=t2.id')
->leftJoin(TABLE_RELEASERELATED)->alias('t6')->on("t1.id=t6.release AND t6.objectType='branch'")