diff --git a/module/project/control.php b/module/project/control.php index 825c277453..56282a0926 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -234,7 +234,6 @@ class project extends control { $selectedProgram = $this->loadModel('program')->getByID($selectedProgramID); if($selectedProgram->budget) $availableBudget = $this->program->getBudgetLeft($selectedProgram); - if(isset($selectedProgram)) $allProducts = $this->program->getProductPairs($selectedProgram->id, 'assign', 'noclosed'); } if(!empty($objectID)) @@ -253,17 +252,16 @@ class project extends control $data = array(); if(isset($selectedProgram)) { - $data['selectedProgramBegin'] = $selectedProgram->begin; - $data['selectedProgramEnd'] = $selectedProgram->end; - $data['budgetUnit'] = $selectedProgram->budgetUnit; - $allProducts = array(0 => '') + $allProducts; - /* Finish task #64882.Get the path of the currently selected program. */ - $data['selectedProgramPath'] = explode(',', $selectedProgram->path); - /* Get the products that can be linked with the currently selected program. */ - $data['allProducts'] = html::select("products[0]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'"); - $data['plans'] = html::select('plans[][][]', '', '', 'class=\'form-control chosen\' multiple'); + $data['selectedProgramBegin'] = $selectedProgram->begin; + $data['selectedProgramEnd'] = $selectedProgram->end; + $data['budgetUnit'] = $selectedProgram->budgetUnit; + $data['selectedProgramPath'] = explode(',', $selectedProgram->path); } + $allProducts = array(0 => '') + $this->program->getProductPairs($selectedProgramID, 'assign', 'noclosed'); + $data['allProducts'] = html::select("products[0]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'"); + $data['plans'] = html::select('plans[][][]', '', '', 'class=\'form-control chosen\' multiple'); + /* Finish task #64882.Get the path of the last selected program. */ if(!empty($objectID)) $data['objectPath'] = explode(',', $object->path); if(isset($availableBudget)) $data['availableBudget'] = $availableBudget;