From 6c23d4a336e7a7aba7d2fc640b5dfa5101e3f108 Mon Sep 17 00:00:00 2001 From: mayue Date: Tue, 9 Nov 2021 09:37:33 +0800 Subject: [PATCH 1/2] * Fix bug #15688. --- module/testcase/control.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/testcase/control.php b/module/testcase/control.php index 2bc231f972..7ce733bc65 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -436,8 +436,8 @@ class testcase extends control if($currentModuleID) { $productModules = $this->tree->getOptionMenu($productID, 'story'); - $currentModuleID = array_key_exists($currentModuleID,$productModules) ? $currentModuleID : 0; - $modules = $this->loadModel('tree')->getStoryModule($currentModuleID); + $storyModuleID = array_key_exists($currentModuleID, $productModules) ? $currentModuleID : 0; + $modules = $this->loadModel('tree')->getStoryModule($storyModuleID); $modules = $this->tree->getAllChildID($modules); } $stories = $this->story->getProductStoryPairs($productID, $branch, $modules, array_keys($storyStatus), 'id_desc', 50, 'null', 'story', false); From cafb5d08a83026b822817afbf71f0ecb5d23cc7e Mon Sep 17 00:00:00 2001 From: mayue Date: Tue, 9 Nov 2021 09:47:10 +0800 Subject: [PATCH 2/2] * Fix bug #15688. --- module/testcase/control.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/testcase/control.php b/module/testcase/control.php index 7ce733bc65..84c200a39f 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -435,10 +435,10 @@ class testcase extends control $modules = array(); if($currentModuleID) { - $productModules = $this->tree->getOptionMenu($productID, 'story'); - $storyModuleID = array_key_exists($currentModuleID, $productModules) ? $currentModuleID : 0; - $modules = $this->loadModel('tree')->getStoryModule($storyModuleID); - $modules = $this->tree->getAllChildID($modules); + $productModules = $this->tree->getOptionMenu($productID, 'story'); + $storyModuleID = array_key_exists($currentModuleID, $productModules) ? $currentModuleID : 0; + $modules = $this->loadModel('tree')->getStoryModule($storyModuleID); + $modules = $this->tree->getAllChildID($modules); } $stories = $this->story->getProductStoryPairs($productID, $branch, $modules, array_keys($storyStatus), 'id_desc', 50, 'null', 'story', false); if($this->app->tab != 'qa')