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

* Adjust PRJManageProducts method.

Browse Source
This commit is contained in:
leiyong
2020-11-22 22:27:16 +08:00
parent e70ad43a6d
commit de0a5ba04a
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/control.php
+3 -7
View File
@@ -1369,7 +1369,7 @@ class program extends control
public function PRJManageProducts($projectID, $programID)
{
$this->lang->navGroup->program = 'project';
$browseProjectLink = inLink('PRJBrowse', "programID=$programID");
$browseProjectLink = $this->session->PRJBrowse ? $this->session->PRJBrowse : inLink('PRJBrowse', "programID=$programID");
if(!empty($_POST))
{
@@ -1395,10 +1395,6 @@ class program extends control
$this->loadModel('product');
$project = $this->project->getById($projectID);
/* Title and position. */
$title = $this->lang->project->manageProducts . $this->lang->colon . $project->name;
$position[] = html::a($browseProjectLink, $project->name);
$position[] = $this->lang->project->manageProducts;
$allProducts = $this->program->getPGMProductPairs($project->parent, 'assign', 'noclosed');
$linkedProducts = $this->project->getProducts($project->id);
@@ -1412,8 +1408,8 @@ class program extends control
}
/* Assign. */
$this->view->title = $title;
$this->view->position = $position;
$this->view->title = $this->lang->project->manageProducts . $this->lang->colon . $project->name;
$this->view->position[] = $this->lang->project->manageProducts;
$this->view->allProducts = $allProducts;
$this->view->linkedProducts = $linkedProducts;
$this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($allProducts), '', $linkedBranches);
module/program/model.php
+2 -2
View File
@@ -1361,9 +1361,9 @@ class programModel extends model
if(!dao::isError())
{
if($project->parent != $oldProject->parent) $this->loadModel('project')->updateProducts($projectID);
$this->loadModel('project')->updateProducts($projectID);
$this->file->updateObjectID($this->post->uid, $projectID, 'project');
$whitelist = explode(',', $project->whitelist);
$this->loadModel('personnel')->updateWhitelist($whitelist, 'project', $projectID);
if($project->acl != 'open') $this->loadModel('user')->updateUserView($projectID, 'project');