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

* Fix doc fullscreen.

Browse Source
This commit is contained in:
Yagami
2018-11-20 09:29:50 +08:00
parent e576594489
commit 56e8978654
6 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/tree/model.php
+3 -2
View File
@@ -226,7 +226,7 @@ class treeModel extends model
$modules = $this->dao->select('*')->from(TABLE_MODULE)->where("((root = '" . (int)$rootID . "' and type = 'task' and parent != 0) OR (root = $id and type = 'story'))")
->beginIF($startModulePath)->andWhere('path')->like($startModulePath)->fi()
->andWhere('deleted')->eq(0)
->orderBy('grade desc, type, `order`')
->orderBy('grade desc, branch, type, `order`')
->fetchAll('id');
}
else
@@ -240,7 +240,8 @@ class treeModel extends model
foreach($modules as $module)
{
if($type == 'product' and !isset($projectModules[$module->id])) continue;
$parentModules = explode(',', trim($module->path, ','));
if($type == 'product' and isset($noProductModules[$parentModules[0]])) continue;
$rootName = ($productNum > 1 and $type == 'product') ? "/$rootModule/" : '/';
if($type == 'product' and $module->branch and isset($branchGroups[$id][$module->branch])) $rootName .= $branchGroups[$id][$module->branch] . '/';
$this->buildTreeArray($treeMenu, $modules, $module, $rootName);