From de0a5ba04a6e589d70d9a34da9b4dbc0afa23727 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Sun, 22 Nov 2020 22:27:16 +0800
Subject: [PATCH] * Adjust PRJManageProducts method.

---
 module/program/control.php | 10 +++-------
 module/program/model.php   |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/module/program/control.php b/module/program/control.php
index a2590393ad..61bda463d7 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -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);
diff --git a/module/program/model.php b/module/program/model.php
index fb6bf5106a..e9f298a13c 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -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');