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

* Fix bug.

Browse Source
This commit is contained in:
leiyong
2020-11-03 11:00:27 +08:00
parent ef9a6db0ea
commit d308a7e9ea
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+5 -1
View File
@@ -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)
module/release/model.php
+2 -2
View File
@@ -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;