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

Merge branch 'master' into 'sprint/174_hufangzhou_45085'

Browse Source 
# Conflicts:
#   module/story/model.php
This commit is contained in:
孙广明
2021-11-29 07:26:45 +00:00
parent 883f87a19c 5ad303eca9
commit 8d9fb81d9d
73 changed files with 602 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/tree/model.php
+10 -9
View File
@@ -136,17 +136,14 @@ class treeModel extends model
if($type == 'line') $rootID = 0;
$branches = array($branch => '');
$branches = array();
if(strpos('story|bug|case', $type) !== false)
{
$product = $this->loadModel('product')->getById($rootID);
if($product and $product->type != 'normal')
{
$branchList = array('null' => '') + $this->loadModel('branch')->getPairs($rootID, 'all');
if(!$branch) $newBranches['null'] = '';
$newBranches[$branch] = $branchList[$branch];
$branches = $branch === 'all' ? $branchList : $newBranches;
$branchPairs = $this->loadModel('branch')->getPairs($rootID, 'all');
$branches = $branch === 'all' ? $branchPairs : array($branch => $branchPairs[$branch]);
}
elseif($product and $product->type == 'normal')
{
@@ -157,11 +154,15 @@ class treeModel extends model
$treeMenu = array();
foreach($branches as $branchID => $branch)
{
$stmt = $this->dbh->query($this->buildMenuQuery($rootID, $type, $startModule, $branchID));
$modules = array();
$stmt = $this->dbh->query($this->buildMenuQuery($rootID, $type, $startModule, $branchID));
$modules = array();
while($module = $stmt->fetch()) $modules[$module->id] = $module;
foreach($modules as $module) $this->buildTreeArray($treeMenu, $modules, $module, (empty($branch) or $branch == 'null') ? '/' : "/$branch/");
foreach($modules as $module)
{
$branchName = ($product->type != 'normal' and $module->branch == BRANCH_MAIN) ? $this->lang->branch->main : $branch;
$this->buildTreeArray($treeMenu, $modules, $module, (empty($branchName)) ? '/' : "/$branchName/");
}
}
ksort($treeMenu);