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

* fix bug for tree.

Browse Source
This commit is contained in:
wangyidong
2015-11-13 09:25:36 +08:00
parent 886eefeca3
commit 603f64a618
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/tree/model.php
View File

@@ -370,6 +370,7 @@ class treeModel extends model
/* tree menu. */
$tree = '';
if(empty($branchGroups[$id])) $branchGroups[$id]['0'] = '';
foreach($branchGroups[$id] as $branch => $branchName)
{
$treeMenu = array();
@@ -447,13 +448,14 @@ class treeModel extends model
/* tree menu. */
$tree = '';
if(empty($branchGroups[$id])) $branchGroups[$id]['0'] = '';
foreach($branchGroups[$id] as $branch => $branchName)
{
$treeMenu = array();
$query = $this->dao->select('*')->from(TABLE_MODULE)->where("(root = $id and type = 'story')")
->andWhere('branch')->eq($branch)
->beginIF($startModulePath)->andWhere('path')->like($startModulePath)->fi()
->orderBy('grade desc, type, `order`')
->orderBy('grade desc, branch, type, `order`')
->get();
$stmt = $this->dbh->query($query);
while($module = $stmt->fetch())
@@ -464,8 +466,6 @@ class treeModel extends model
}
if(isset($treeMenu[0]) and $branch)
{
$link = helper::createLink('project', 'story', "project=$rootID&ordery=&status=byBrach&praram=$branch");
if($productNum > 1) $menu .= "<li>" . html::a($link, $product, '_self', "id='product$id'");
$treeMenu[0] = "<li>" . html::a($link, $branchName, '_self', "id='branch$branch'") . "<ul>{$treeMenu[0]}</ul></li>";
}
$tree .= isset($treeMenu[0]) ? $treeMenu[0] : '';