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!6261
This commit is contained in:
王怡栋
2022-11-21 00:53:18 +00:00
parent e1a7dfb06e efb20b02d8
commit 68e6f5695f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/model.php
+3 -3
View File
@@ -255,7 +255,7 @@ class productplanModel extends model
$plans = $this->reorder4Children($plans);
$planPairs = array();
$mainplan = array();
$mainPlan = array();
$this->app->loadLang('bug');
$this->app->loadLang('branch');
foreach($plans as $plan)
@@ -267,11 +267,11 @@ class productplanModel extends model
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];
$mainPlan = $planPairs[$plan->id];
unset($planPairs[$plan->id]);
}
}
array_splice($planPairs, 0, 0, $mainplan);
array_splice($planPairs, 0, 0, $mainPlan);
return array('' => '', 'ditto' => $this->lang->bug->ditto) + $planPairs;
}