From d9b1b00fe3c283a5d78d02506afccb7ff77a4f68 Mon Sep 17 00:00:00 2001 From: liyang Date: Mon, 19 Feb 2024 15:03:10 +0800 Subject: [PATCH] * Fix Bug #45461. --- module/project/zen.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/module/project/zen.php b/module/project/zen.php index 0a2c90e431..c8119d41be 100755 --- a/module/project/zen.php +++ b/module/project/zen.php @@ -299,7 +299,12 @@ class projectZen extends project { foreach($branchPlans as $branchID => $plans) { - $productPlans[$productID][$branchID] = array_combine(array_column($plans, 'id'), array_column($plans, 'title')); + foreach($plans as $planID => $plan) + { + if(empty($plan)) continue; + $planDate = $plan->begin == $this->config->productplan->future && $plan->end == $this->config->productplan->future ? ' ' . $this->lang->productplan->future : " [{$plan->begin} ~ {$plan->end}]"; + $productPlans[$productID][$branchID][$planID] = $plan->title . $planDate; + } } }