Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master_feedback_1468' into 'master'

Browse Source 
* Adjust code for feedback #1468.

See merge request easycorp/zentaopms!6300
This commit is contained in:
王怡栋
2022-11-22 08:02:34 +00:00
parent 827f04e98a d44f253a49
commit 72106fa341
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/model.php
+1 -9
View File
@@ -255,8 +255,6 @@ class productplanModel extends model
$plans = $this->reorder4Children($plans); $plans = $this->reorder4Children($plans);
$planPairs = array(); $planPairs = array();
$mainPlan = array();
$this->app->loadLang('bug');
$this->app->loadLang('branch'); $this->app->loadLang('branch');
foreach($plans as $plan) foreach($plans as $plan)
{ {
@@ -265,14 +263,8 @@ class productplanModel extends model
$planPairs[$plan->id] = $plan->title . " [{$plan->begin} ~ {$plan->end}]"; $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->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($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('' => '') + $planPairs;
return array('' => '', 'ditto' => $this->lang->bug->ditto) + $planPairs;
} }
/** /**