From 256c76c0b840c2c6503576750cb8fa1dbf8a1981 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 19 Nov 2021 11:40:58 +0800 Subject: [PATCH] * Modify code logic. --- module/testcase/control.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/module/testcase/control.php b/module/testcase/control.php index 5eb51673a9..2a1d4f2f12 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -978,10 +978,17 @@ class testcase extends control } } - if($this->app->tab == 'project') $productBranches = $this->loadModel('execution')->getBranchByProduct(array_keys($products), $this->session->project); + if($this->app->tab == 'project') + { + $productBranches = $this->loadModel('execution')->getBranchByProduct(array_keys($products), $this->session->project); + } + else + { + $productBranches = $this->loadModel('branch')->getByProducts(array_keys($products), 'ignoreNormal'); + } $this->view->products = $products; - $this->view->productBranches = isset($productBranches) ? $productBranches : $this->loadModel('branch')->getByProducts(array_keys($products), 'ignoreNormal'); + $this->view->productBranches = $productBranches; } // if(!$this->testcase->forceNotReview()) unset($this->lang->testcase->statusList['wait']); /* Bug#1343 */