From 12054383a6d82e831ebcc9090f8fc9ccccb1ff95 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Mon, 15 Nov 2021 09:28:58 +0800 Subject: [PATCH] * Fix bug #16179. --- module/tree/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/tree/model.php b/module/tree/model.php index 9d17e495e0..cdfa10f47e 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -376,7 +376,7 @@ class treeModel extends model if($branch) { $branchName = $this->loadModel('branch')->getById($branch); - $branches = array('null' => '', $branch => $branchName); + $branches = array($branch => $branchName); $extra = array('rootID' => $rootID, 'branch' => $branch); } @@ -384,7 +384,7 @@ class treeModel extends model $product = $this->loadModel('product')->getById($rootID); if(strpos('story|bug|case', $type) !== false and $branch === 'all') { - if($product->type != 'normal') $branches = array('null' => '', BRANCH_MAIN => $this->lang->branch->main) + $this->loadModel('branch')->getPairs($rootID, 'noempty'); + if($product->type != 'normal') $branches = array(BRANCH_MAIN => $this->lang->branch->main) + $this->loadModel('branch')->getPairs($rootID, 'noempty'); } /* Add for task #1945. check the module has case or no. */