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

* Fix programID in program module.

Browse Source
This commit is contained in:
zhujinyong
2021-03-23 14:47:58 +08:00
parent 5af5c9a92c
commit 1e340e1040
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+10 -4
View File
@@ -1409,8 +1409,6 @@ class project extends control
*/
public function manageProducts($projectID, $programID = 0, $from = 'project')
{
$this->project->setMenu($projectID);
if(!empty($_POST))
{
if(!isset($_POST['products']))
@@ -1429,15 +1427,23 @@ class project extends control
$diffProducts = array_merge(array_diff($oldProducts, $newProducts), array_diff($newProducts, $oldProducts));
if($diffProducts) $this->loadModel('action')->create('project', $projectID, 'Managed', '', !empty($_POST['products']) ? join(',', $_POST['products']) : '');
$locateLink = $this->session->projectBrowse ? $this->session->projectBrowse : inLink('manageProducts', "projectID=$projectID");
$locateLink = inLink('manageProducts', "projectID=$projectID");
if($from == 'program') $locateLink = $this->createLink('program', 'browse');
if($from == 'programproject') $locateLink = $this->session->programProject ? $this->session->programProject : inLink('programProject', "projectID=$projectID");
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
}
$this->loadModel('product');
$this->loadModel('program');
$project = $this->project->getById($projectID);
if($this->app->openApp == 'program')
{
$this->program->setMenu($project->parent);
}
else if($this->app->openApp == 'project')
{
$this->project->setMenu($projectID);
}
$allProducts = $this->program->getProductPairs($project->parent, 'assign', 'noclosed');
$linkedProducts = $this->product->getProducts($project->id);