From 940e79bf1f84c034135201eaf1bb339026f608c9 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 18 Nov 2021 16:08:28 +0800
Subject: [PATCH 1/3] * Fix bug #16406.

---
 module/testcase/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index cc57a05dfc..fb6ff972f2 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -575,7 +575,7 @@ class testcase extends control
         $this->view->moduleOptionMenu = $moduleOptionMenu;
         $this->view->currentModuleID  = $currentModuleID;
         $this->view->branch           = $branch;
-        $this->view->branches         = $this->loadModel('branch')->getPairs($productID);
+        $this->view->branches         = $this->loadModel('branch')->getPairs($productID, 'active');
         $this->view->needReview       = $this->testcase->forceNotReview() == true ? 0 : 1;
 
         $this->display();

From d03b905ffdfb6a4e2defb3c3bb59254c082d60d7 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 18 Nov 2021 16:30:07 +0800
Subject: [PATCH 2/3] * Fix bug #16407.

---
 module/testcase/control.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index fb6ff972f2..ac0f94e510 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -213,7 +213,7 @@ class testcase extends control
         $this->view->param         = $param;
         $this->view->cases         = $cases;
         $this->view->branch        = $branch;
-        $this->view->branches      = $this->loadModel('branch')->getPairs($productID);
+        $this->view->branches      = $this->loadModel('branch')->getPairs($productID, 'active');
         $this->view->suiteList     = $this->loadModel('testsuite')->getSuites($productID);
         $this->view->suiteID       = $suiteID;
         $this->view->setModule     = true;
@@ -814,7 +814,7 @@ class testcase extends control
             }
 
             $this->view->productID        = $productID;
-            $this->view->branches         = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($productID);
+            $this->view->branches         = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($productID, 'active');
             $this->view->productName      = $this->products[$productID];
             $this->view->moduleOptionMenu = $moduleOptionMenu;
             $this->view->stories          = $this->story->getProductStoryPairs($productID, $case->branch);
@@ -899,7 +899,7 @@ class testcase extends control
                 $modules  = array();
                 if($product->type != 'normal')
                 {
-                    $branches = $this->loadModel('branch')->getPairs($productID);
+                    $branches = $this->loadModel('branch')->getPairs($productID, 'active');
                     if($branch === 'all')
                     {
                         $modules[0] = $this->tree->getOptionMenu($productID, $viewType = 'case', 0, 0);

From 1d9fc9d47612b993f7ac9fd503caa328c2b9eb18 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 18 Nov 2021 17:26:27 +0800
Subject: [PATCH 3/3] * Fix bug #16407.

---
 module/testcase/control.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index ac0f94e510..fb6ff972f2 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -213,7 +213,7 @@ class testcase extends control
         $this->view->param         = $param;
         $this->view->cases         = $cases;
         $this->view->branch        = $branch;
-        $this->view->branches      = $this->loadModel('branch')->getPairs($productID, 'active');
+        $this->view->branches      = $this->loadModel('branch')->getPairs($productID);
         $this->view->suiteList     = $this->loadModel('testsuite')->getSuites($productID);
         $this->view->suiteID       = $suiteID;
         $this->view->setModule     = true;
@@ -814,7 +814,7 @@ class testcase extends control
             }
 
             $this->view->productID        = $productID;
-            $this->view->branches         = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($productID, 'active');
+            $this->view->branches         = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($productID);
             $this->view->productName      = $this->products[$productID];
             $this->view->moduleOptionMenu = $moduleOptionMenu;
             $this->view->stories          = $this->story->getProductStoryPairs($productID, $case->branch);
@@ -899,7 +899,7 @@ class testcase extends control
                 $modules  = array();
                 if($product->type != 'normal')
                 {
-                    $branches = $this->loadModel('branch')->getPairs($productID, 'active');
+                    $branches = $this->loadModel('branch')->getPairs($productID);
                     if($branch === 'all')
                     {
                         $modules[0] = $this->tree->getOptionMenu($productID, $viewType = 'case', 0, 0);