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

* Fix bug #42306, show branch field only if the execution is releated to a branch product.

Browse Source
This commit is contained in:
liumengyi
2024-02-22 16:17:26 +08:00
parent 1a6525d208
commit 73ddfdd862
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/zen.php
+14 -4
View File
@@ -408,13 +408,23 @@ class bugZen extends bug
*/
protected function getExportFields(int $executionID, object|bool $product): string
{
$exportFields = $this->config->bug->exportFields;
if(isset($product->type) and $product->type == 'normal') $exportFields = str_replace('branch,', '', $exportFields);
$exportFields = str_replace(' ', '', $this->config->bug->exportFields);
if(isset($product->type) and $product->type == 'normal') $exportFields = str_replace(',branch,', ',', ",{$exportFields},");;
if(!$product)
{
$products = $this->loadModel('product')->getProducts($executionID);
$hasBranch = false;
foreach($products as $product)
{
if($product->type != 'normal') $hasBranch = true;
}
if(!$hasBranch) $exportFields = str_replace(',branch,', ',', ",{$exportFields},");
}
if($this->app->tab == 'project' or $this->app->tab == 'execution')
{
$execution = $this->loadModel('execution')->getByID($executionID);
if(empty($execution->multiple)) $exportFields = str_replace('execution,', '', $exportFields);
if(empty($execution->hasProduct) || !empty($product->shadow)) $exportFields = str_replace(array('product,', 'branch,'), '', $exportFields);
if(empty($execution->multiple)) $exportFields = str_replace(',execution,', ',', ",{$exportFields},");
if(empty($execution->hasProduct) || !empty($product->shadow)) $exportFields = str_replace(array(',product,', ',branch,'), ',', ",{$exportFields},");
}
return $exportFields;