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

Merge branch 'bug_30309' into 'master'

Browse Source 
* Fix bug#30309

See merge request easycorp/zentaopms!6399
This commit is contained in:
王怡栋
2022-11-29 06:47:17 +00:00
parent 6111ca8fae 9b63267e10
commit cdb70c5158
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+22 -5
View File
@@ -271,13 +271,30 @@ class product extends control
/* Display status of branch. */
$branchOption = array();
$branchTagOption = array();
if($product and $product->type != 'normal')
if(!$product and $isProjectStory)
{
$branches = $this->loadModel('branch')->getList($productID, $projectID, 'all');
foreach($branches as $branchInfo)
/* Get branch display under multiple products. */
foreach($projectProducts as $projectProduct)
{
$branchOption[$branchInfo->id] = $branchInfo->name;
$branchTagOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : '');
if($projectProduct and $projectProduct->type != 'normal')
{
$branches = $this->loadModel('branch')->getList($projectProduct->id, $projectID, 'all');
foreach($branches as $branchInfo) $branchOptions[$projectProduct->id][$branchInfo->id] = $branchInfo->name;
}
}
$this->view->branchOptions = $branchOptions;
}
else
{
if($product and $product->type != 'normal')
{
$branches = $this->loadModel('branch')->getList($productID, $projectID, 'all');
foreach($branches as $branchInfo)
{
$branchOption[$branchInfo->id] = $branchInfo->name;
$branchTagOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : '');
}
}
}
module/product/view/browse.html.php
+1
View File
@@ -357,6 +357,7 @@ js::set('vision', $this->config->vision);
<?php foreach($stories as $story):?>
<tr data-id='<?php echo $story->id?>' data-estimate='<?php echo $story->estimate?>' <?php if(!empty($story->children)) echo "data-children=" . count($story->children);?> data-cases='<?php echo zget($storyCases, $story->id, 0);?>'>
<?php $story->from = $from;?>
<?php if(!empty($branchOptions) and isset($branchOptions[$story->product])) $branchOption = $branchOptions[$story->product];?>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
foreach($setting as $key => $value)