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

* Fix bug #21374.

Browse Source
This commit is contained in:
zhouxin
2022-04-12 07:40:28 +00:00
parent e1eb543ed7
commit 125fa381fc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/view/browse.html.php
-2
View File
@@ -143,7 +143,6 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
?>
</ul>
</div>
<?php if(common::canModify('product', $product)):?>
<div class='btn-group dropdown'>
<?php
$createStoryLink = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=$projectID&bugID=0&planID=0&todoID=0&extra=&type=$storyType");
@@ -228,7 +227,6 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
}
?>
</div>
<?php endif;?>
</div>
<?php endif;?>
</div>
module/story/control.php
+3 -1
View File
@@ -229,7 +229,9 @@ class story extends control
/* Set products, users and module. */
if($objectID != 0)
{
$products = $this->product->getProductPairsByProject($objectID);
global $config;
$onlyNoClosed = empty($config->CRProduct) ? 'noclosed' : '';
$products = $this->product->getProductPairsByProject($objectID, $onlyNoClosed);
$productID = empty($productID) ? key($products) : $productID;
$product = $this->product->getById(($productID and array_key_exists($productID, $products)) ? $productID : key($products));
$productBranches = $product->type != 'normal' ? $this->loadModel('execution')->getBranchByProduct($productID, $objectID) : array();