From d44f253a49408b12d729b64632e6d375ac4bae63 Mon Sep 17 00:00:00 2001 From: liuhong Date: Tue, 22 Nov 2022 06:50:35 +0000 Subject: [PATCH] * Adjust code for feedback #1468. --- module/productplan/model.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/module/productplan/model.php b/module/productplan/model.php index f014d79f54..ad25b34dd8 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -255,8 +255,6 @@ class productplanModel extends model $plans = $this->reorder4Children($plans); $planPairs = array(); - $mainPlan = array(); - $this->app->loadLang('bug'); $this->app->loadLang('branch'); foreach($plans as $plan) { @@ -265,14 +263,8 @@ class productplanModel extends model $planPairs[$plan->id] = $plan->title . " [{$plan->begin} ~ {$plan->end}]"; if($plan->begin == $this->config->productplan->future and $plan->end == $this->config->productplan->future) $planPairs[$plan->id] = $plan->title . ' ' . $this->lang->productplan->future; if($plan->productType != 'normal') $planPairs[$plan->id] = ($plan->branchName ? $plan->branchName : $this->lang->branch->main) . ' / ' . $planPairs[$plan->id]; - if(empty($plan->branchName)) - { - $mainPlan = $planPairs[$plan->id]; - unset($planPairs[$plan->id]); - } } - array_splice($planPairs, 0, 0, $mainPlan); - return array('' => '', 'ditto' => $this->lang->bug->ditto) + $planPairs; + return array('' => '') + $planPairs; } /**