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

Merge branch 'master_xieqiyu_75379' into 'master'

Browse Source 
* Finish task#75379,#75324.

See merge request easycorp/zentaopms!6083
This commit is contained in:
孙广明
2022-11-09 02:55:57 +00:00
parent 860001dc88 af5b858388
commit bf20ea3577
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+1 -1
View File
@@ -340,7 +340,7 @@ class product extends control
$this->view->productName = $productName;
$this->view->moduleID = $moduleID;
$this->view->stories = $stories;
$this->view->plans = $this->loadModel('productplan')->getPairs($productID, $branch === 'all' ? '' : $branch, '', true);
$this->view->plans = $this->loadModel('productplan')->getPairs($productID, ($branch === 'all' or empty($branch)) ? '' : $branch, '', true);
$this->view->productPlans = isset($productPlans) ? array(0 => '') + $productPlans : array();
$this->view->summary = $this->product->summary($stories, $storyType);
$this->view->moduleTree = $moduleTree;
module/product/view/browse.html.php
+2 -1
View File
@@ -507,9 +507,9 @@ js::set('storyType', $storyType);
</ul>
</div>
<?php if(($product->type != 'normal' and $branchID != 'all') or $product->type == 'normal'):?>
<?php $isShowModuleBTN = ($isProjectStory and $browseType != 'bybranch') ? false : true;?>
<?php if($canBatchChangeModule and $productID and $isShowModuleBTN):?>
<?php if(($product->type != 'normal' and $branchID != 'all') or $product->type == 'normal')?>
<div class="btn-group dropup">
<button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->story->moduleAB;?> <span class="caret"></span></button>
<?php $withSearch = count($modules) > 8;?>
@@ -567,6 +567,7 @@ js::set('storyType', $storyType);
</div>
</div>
<?php endif;?>
<?php endif;?>
<?php if($canBatchAssignTo):?>
<div class="btn-group dropup">