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

* Finish task #92298.

Browse Source
This commit is contained in:
Yagami
2023-05-09 18:24:21 +08:00
parent f577f4876a
commit 27aef5138b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/view/browse.html.php
+2 -2
View File
@@ -81,11 +81,11 @@ js::set('vision', $this->config->vision);
<a href='javascript:;' class='btn btn-link btn-limit text-ellipsis' data-toggle='dropdown' style="max-width: 120px;"><div class='text' style="overflow: hidden;" title='<?php echo $productName;?>'><?php echo $productName;?></div> <span class='caret'></span></a>
<ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
<?php
echo '<li ' . (empty($productID) ? "class='active'" : '') . '>' . html::a($this->createLink('projectstory', 'story', "projectID=$projectID"), $lang->product->all) . "</li>";
echo '<li ' . (empty($productID) ? "class='active'" : '') . '>' . html::a($this->createLink('projectstory', 'story', "projectID=$projectID&productID=0&branch=all&browseType=&param=0&storyType=$storyType"), $lang->product->all) . "</li>";
foreach($projectProducts as $projectProduct)
{
$active = $projectProduct->id == $productID ? "class='active'" : '';
echo "<li $active>" . html::a($this->createLink('projectstory', 'story', "projectID=$projectID&productID=$projectProduct->id&branch=all"), $projectProduct->name, '', "title='{$projectProduct->name}' class='text-ellipsis'") . "</li>";
echo "<li $active>" . html::a($this->createLink('projectstory', 'story', "projectID=$projectID&productID=$projectProduct->id&branch=all&browseType=&param=0&storyType=$storyType"), $projectProduct->name, '', "title='{$projectProduct->name}' class='text-ellipsis'") . "</li>";
}
?>
</ul>
module/tree/model.php
+2 -1
View File
@@ -430,6 +430,7 @@ class treeModel extends model
$this->loadModel('branch');
$projectID = zget($extra, 'projectID', 0);
$projectModel = $this->dao->findByID($projectID)->from(TABLE_PROJECT)->fetch('model');
$branches = array($branch => '');
$executionModules = array();
if($branch and empty($projectID))
@@ -470,7 +471,7 @@ class treeModel extends model
{
$this->buildTree($treeMenu, $module, $type, $userFunc, $extra, $branch);
}
elseif(isset($executionModules[$module->id]) || !empty($product->shadow))
elseif(isset($executionModules[$module->id]) || !empty($product->shadow) || $projectModel == 'ipd')
{
$this->buildTree($treeMenu, $module, $type, $userFunc, $extra, $branch);
}