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

Merge branch 'sprint/170_wangyidong' into 'sprint/170'

Browse Source 
* fix bug for get tree menu in project view.

See merge request easycorp/zentaopms!428
This commit is contained in:
孙广明
2021-11-12 05:17:02 +00:00
parent b71f540905 1dd4bbc079
commit e237e5267c
1 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/tree/model.php
-36
View File
@@ -685,24 +685,6 @@ class treeModel extends model
if($tree && ($productNum > 1 or $manage)) $tree = "<ul>" . $tree . "</ul>\n</li>";
$menu .= $tree;
}
/* Get execution module. */
if($startModule == 0)
{
/* tree menu. */
$treeMenu = array();
$query = $this->dao->select('*')->from(TABLE_MODULE)
->where('root')->eq((int)$rootID)
->andWhere('type')->eq('bug')
->andWhere('deleted')->eq(0)
->orderBy('grade desc, `order`, type')
->get();
$stmt = $this->dbh->query($query);
while($module = $stmt->fetch()) $this->buildTree($treeMenu, $module, 'bug', $userFunc, $extra);
$tree = isset($treeMenu[0]) ? $treeMenu[0] : '';
$menu .= $tree . '</li>';
}
$menu .= '</ul>';
return $menu;
}
@@ -771,24 +753,6 @@ class treeModel extends model
if($tree) $tree = "<ul>" . $tree . "</ul>\n</li>";
$menu .= $tree;
}
/* Get case module. */
if($startModule == 0)
{
/* tree menu. */
$treeMenu = array();
$query = $this->dao->select('*')->from(TABLE_MODULE)
->where('root')->eq((int)$rootID)
->andWhere('type')->eq('case')
->andWhere('deleted')->eq(0)
->orderBy('grade desc, `order`, type')
->get();
$stmt = $this->dbh->query($query);
while($module = $stmt->fetch()) $this->buildTree($treeMenu, $module, 'case', $userFunc, $extra);
$tree = isset($treeMenu[0]) ? $treeMenu[0] : '';
$menu .= $tree . '</li>';
}
$menu .= '</ul>';
return $menu;
}