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-13 07:59:57 +00:00
parent e172ea39b6
commit 6e6deaa462
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+2
View File
@@ -2738,6 +2738,8 @@ EOD;
{
global $config;
if(empty($object)) return true;
if($type == 'product' and empty($config->CRProduct) and $object->status == 'closed') return false;
if($type == 'execution' and empty($config->CRExecution) and $object->status == 'closed') return false;
module/product/view/browse.html.php
+4 -2
View File
@@ -63,9 +63,9 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
<ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
<?php
echo "<li>" . html::a($this->createLink('projectstory', 'story', "projectID=$projectID"), $lang->product->all) . "</li>";
foreach($projectProducts as $product)
foreach($projectProducts as $projectProduct)
{
echo "<li>" . html::a($this->createLink('projectstory', 'story', "projectID=$projectID&productID=$product->id&branch=all"), $product->name, '', "title='{$product->name}' class='text-ellipsis'") . "</li>";
echo "<li>" . html::a($this->createLink('projectstory', 'story', "projectID=$projectID&productID=$projectProduct->id&branch=all"), $projectProduct->name, '', "title='{$projectProduct->name}' class='text-ellipsis'") . "</li>";
}
?>
</ul>
@@ -143,6 +143,7 @@ $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");
@@ -227,6 +228,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
}
?>
</div>
<?php endif;?>
</div>
<?php endif;?>
</div>