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

* Merged 18.x

Browse Source
This commit is contained in:
zenggang
2023-08-28 09:30:26 +00:00
parent b20de1f1c5 534ed8132b
commit fdd027a824
207 changed files with 4262 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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);
}