diff --git a/module/project/control.php b/module/project/control.php index c0f1cbd525..87b387f67d 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1234,7 +1234,10 @@ class project extends control $position[] = html::a($browseProjectLink, $project->name); $position[] = $this->lang->project->edit; - $allProducts = array(0 => '') + $this->loadModel('product')->getPairs('noclosed|nocode', $this->session->PRJ); + $allProducts = array(0 => ''); + $projectProsucts = $this->project->getProducts($project->project); + foreach($projectProsucts as $product) $allProducts[$product->id] = $product->name; + $linkedProducts = $this->project->getProducts($project->id); $linkedBranches = array(); foreach($linkedProducts as $product) @@ -1242,6 +1245,7 @@ class project extends control if(!isset($allProducts[$product->id])) $allProducts[$product->id] = $product->name; if($product->branch) $linkedBranches[$product->branch] = $product->branch; } + $this->loadModel('productplan'); $productPlans = array(0 => ''); foreach($linkedProducts as $product) diff --git a/module/release/model.php b/module/release/model.php index 24ad909d32..0639a4e3f8 100644 --- a/module/release/model.php +++ b/module/release/model.php @@ -120,7 +120,7 @@ class releaseModel extends model if($this->post->date > date('Y-m-d')) return dao::$errors[] = $this->lang->release->errorDate; $release = fixer::input('post') - ->add('program', $this->session->PRJ) + ->add('PRJ', $this->session->PRJ) ->add('product', (int)$productID) ->add('branch', (int)$branch) ->setDefault('stories', '') @@ -147,7 +147,7 @@ class releaseModel extends model else { $build = new stdclass(); - $build->program = $this->session->PRJ; + $build->PRJ = $this->session->PRJ; $build->product = (int)$productID; $build->branch = (int)$branch; $build->name = $release->name;