diff --git a/module/productplan/model.php b/module/productplan/model.php index e16df5b933..1492f504db 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -206,15 +206,10 @@ class productplanModel extends model $plans = $this->reorder4Children($plans); $planPairs = array(); - $parent = 0; $parentTitle = array(); foreach($plans as $plan) { - if($plan->parent == '-1') - { - $parent = $plan->id; - $parentTitle[$parent] = $plan->title; - } + if($plan->parent == '-1') $parentTitle[$parent] = $plan->title; if($plan->parent > 0 and isset($parentTitle[$plan->parent])) $plan->title = $parentTitle[$plan->parent] . ' /' . $plan->title; $planPairs[$plan->id] = $plan->title . " [{$plan->begin} ~ {$plan->end}]"; if($plan->begin == '2030-01-01' and $plan->end == '2030-01-01') $planPairs[$plan->id] = $plan->title . ' ' . $this->lang->productplan->future; @@ -257,15 +252,10 @@ class productplanModel extends model $plans = $this->reorder4Children($plans); $planPairs = array(); - $parent = 0; $parentTitle = array(); foreach($plans as $plan) { - if($plan->parent == '-1') - { - $parent = $plan->id; - $parentTitle[$parent] = $plan->title; - } + if($plan->parent == '-1') $parentTitle[$parent] = $plan->title; if($plan->parent > 0 and isset($parentTitle[$plan->parent])) $plan->title = $parentTitle[$plan->parent] . ' /' . $plan->title; $planPairs[$plan->id] = $plan->title . " [{$plan->begin} ~ {$plan->end}]"; if($plan->begin == '2030-01-01' and $plan->end == '2030-01-01') $planPairs[$plan->id] = $plan->title . ' ' . $this->lang->productplan->future; @@ -291,15 +281,10 @@ class productplanModel extends model $plans = $this->reorder4Children($plans); $planPairs = array(); - $parent = 0; $parentTitle = array(); foreach($plans as $plan) { - if($plan->parent == '-1') - { - $parent = $plan->id; - $parentTitle[$parent] = $plan->title; - } + if($plan->parent == '-1') $parentTitle[$parent] = $plan->title; if($plan->parent > 0 and isset($parentTitle[$plan->parent])) $plan->title = $parentTitle[$plan->parent] . ' /' . $plan->title; $planPairs[$plan->id] = $plan->title; } @@ -323,19 +308,13 @@ class productplanModel extends model if(!empty($plans)) $plans = $this->reorder4Children($plans); - $parent = 0; $parentTitle = array(); $planGroup = array(); foreach($plans as $plan) { if(!isset($planGroup[$plan->product][$plan->branch])) $planGroup[$plan->product][$plan->branch] = array('' => ''); - if($plan->parent == '-1') - { - $parent = $plan->id; - $parentTitle[$parent] = $plan->title; - } - + if($plan->parent == '-1') $parentTitle[$parent] = $plan->title; if($plan->parent > 0 and isset($parentTitle[$plan->parent])) $plan->title = $parentTitle[$plan->parent] . ' /' . $plan->title; $planGroup[$plan->product][$plan->branch][$plan->id] = $plan->title . " [{$plan->begin} ~ {$plan->end}]"; if($plan->begin == '2030-01-01' and $plan->end == '2030-01-01') $planGroup[$plan->product][$plan->branch][$plan->id] = $plan->title . ' ' . $this->lang->productplan->future; diff --git a/module/project/js/common.js b/module/project/js/common.js index 0339022d6c..dd1fd8dbc0 100644 --- a/module/project/js/common.js +++ b/module/project/js/common.js @@ -168,7 +168,7 @@ function loadBranches(product) if($inputgroup.find('.chosen-container').size() >= 2) $inputgroup.find('.chosen-container:last').remove(); var index = $inputgroup.find('select:first').attr('id').replace('products' , ''); - $.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=0¶m=noclosed"), function(data) + $.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=0¶m=active"), function(data) { if(data) { diff --git a/module/project/js/create.js b/module/project/js/create.js index 2c0efceb21..a345bde136 100644 --- a/module/project/js/create.js +++ b/module/project/js/create.js @@ -173,7 +173,7 @@ function loadBranches(product) if($inputgroup.find('.chosen-container').size() >= 2) $inputgroup.find('.chosen-container:last').remove(); var index = $inputgroup.find('select:first').attr('id').replace('products' , ''); - $.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=0¶m=noclosed"), function(data) + $.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=0¶m=active"), function(data) { if(data) {