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

* Fix bug #49572, don't set release label to build.

Browse Source
This commit is contained in:
liumengyi
2024-05-20 14:30:58 +08:00
parent eb23349ae3
commit f6c5085b00
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/zen.php
+3 -8
View File
@@ -985,11 +985,11 @@ class bugZen extends bug
if($executionID)
{
$builds = $this->build->getBuildPairs(array($productID), $branch, 'noempty,noterminate,nodone,noreleased', $executionID, 'execution');
$builds = $this->build->getBuildPairs(array($productID), $branch, 'noempty,noterminate,nodone,noreleased', $executionID, 'execution');
}
elseif($projectID)
{
$builds = $this->build->getBuildPairs(array($productID), $branch, 'noempty,noterminate,nodone,noreleased', $projectID, 'project');
$builds = $this->build->getBuildPairs(array($productID), $branch, 'noempty,noterminate,nodone,noreleased', $projectID, 'project');
}
else
{
@@ -2417,12 +2417,7 @@ class bugZen extends bug
$releases = $this->loadModel('build')->getRelatedReleases(array($productID));
$buildItems = array();
foreach($builds as $buildID => $buildName)
{
$buildItem = array('value' => $buildID, 'text' => $buildName);
if(isset($releases[$buildID])) $buildItem['content'] = array('html' => "<div class='flex clip'>{$buildName}</div><label class='label bg-primary-50 text-primary ml-1 flex-none'>{$this->lang->release->common}</label>", 'class' => 'w-full flex nowrap');
$buildItems[$buildID] = $buildItem;
}
foreach($builds as $buildID => $buildName) $buildItems[$buildID] = array('value' => $buildID, 'text' => $buildName);
foreach($releases as $release)
{
if(isset($buildItems[$release->shadow])) $buildItems[$release->shadow]['content'] = array('html' => "<div class='flex clip'>{$buildItems[$release->shadow]['text']}</div><label class='label bg-primary-50 text-primary ml-1 flex-none'>{$this->lang->release->common}</label>", 'class' => 'w-full flex nowrap');