From b2f1495ae6b48b71853d0960bcb56ab81782ccbc Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Wed, 13 Mar 2024 15:27:01 +0800 Subject: [PATCH] * Fix bug#46486. --- module/product/zen.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/product/zen.php b/module/product/zen.php index 78bc0c5027..7fad30cc56 100644 --- a/module/product/zen.php +++ b/module/product/zen.php @@ -1472,7 +1472,7 @@ class productZen extends product $this->view->projectProducts = $projectProducts; $this->view->summary = $this->product->summary($stories, $storyType); - $this->view->plans = $this->loadModel('productplan')->getPairs($productID, ($branch === 'all' || empty($branch)) ? '' : $branch, 'unexpired,noclosed', true); + $this->view->plans = $this->loadModel('productplan')->getPairs($productID, isset($projectProducts[$productID]) ? array(BRANCH_MAIN) + $projectProducts[$productID]->branches : (($branch === 'all' || empty($branch)) ? '' : $branch), 'unexpired,noclosed', true); $this->view->users = $this->loadModel('user')->getPairs('noletter|pofirst|nodeleted'); $this->view->modules = $this->tree->getOptionMenu($productID, 'story', 0, $branchID); $this->view->storyTasks = $this->loadModel('task')->getStoryTaskCounts($storyIdList);