From 1ed7024c175f6b4487e4fc0a193d0c974c21f00f Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Wed, 13 Jan 2021 14:03:52 +0800
Subject: [PATCH] * Finish task#8973.

---
 module/program/control.php                   | 8 +++++++-
 module/program/js/prjedit.js                 | 2 +-
 module/program/view/pgmbrowsebylist.html.php | 2 +-
 module/program/view/prjedit.html.php         | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/module/program/control.php b/module/program/control.php
index 0c2de0fe34..4abe7be4e4 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -914,15 +914,19 @@ class program extends control
      *
      * @param  int    $projectID
      * @param  int    $programID
+     * @param  string $from  project|program
      * @access public
      * @return void
      */
-    public function PRJEdit($projectID = 0, $programID = 0)
+    public function PRJEdit($projectID = 0, $programID = 0, $from = 'project')
     {
         $this->app->loadLang('custom');
         $this->app->loadLang('project');
         $this->loadModel('productplan');
 
+        /* Navigation stay in program when enter from pgmbrowse. */
+        if($from == 'program') $this->app->rawMethod = 'pgmbrowse';
+
         if($_POST)
         {
             $changes = $this->program->PRJUpdate($projectID);
@@ -935,6 +939,7 @@ class program extends control
             }
 
             $url = $this->session->PRJBrowse ? $this->session->PRJBrowse : inLink('PRJBrowse');
+            if($from == 'program') $url = inLink('PGMBrowse');
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $url));
         }
 
@@ -969,6 +974,7 @@ class program extends control
         $this->view->linkedProducts = $linkedProducts;
         $this->view->branchGroups   = $this->loadModel('branch')->getByProducts(array_keys($linkedProducts), '', $linkedBranches);
         $this->view->URSRPairs      = $this->loadModel('custom')->getURSRPairs();
+        $this->view->from           = $from;
 
         $this->display();
     }
diff --git a/module/program/js/prjedit.js b/module/program/js/prjedit.js
index 19900c7783..06e4ae225a 100644
--- a/module/program/js/prjedit.js
+++ b/module/program/js/prjedit.js
@@ -27,7 +27,7 @@ function setParentProgram()
 
     if(confirm(PGMChangeTips))
     {
-        location.href = createLink('program', 'PRJEdit', 'projectID=' + projectID + '&programID=' + parentProgram);
+        location.href = createLink('program', 'PRJEdit', 'projectID=' + projectID + '&programID=' + parentProgram + '&from=' + from);
     }
     else
     {
diff --git a/module/program/view/pgmbrowsebylist.html.php b/module/program/view/pgmbrowsebylist.html.php
index b8d10c3f32..b54fffea5b 100644
--- a/module/program/view/pgmbrowsebylist.html.php
+++ b/module/program/view/pgmbrowsebylist.html.php
@@ -86,7 +86,7 @@
               <?php if($program->status != 'closed') common::printIcon('program', 'PRJActivate', "projectID=$program->id", $program, 'list', 'magic', '', 'iframe', true);?>
             </ul>
           </div>
-          <?php common::printIcon('program', 'PRJEdit',          "projectID=$program->id", $program, 'list', 'edit');?>
+          <?php common::printIcon('program', 'PRJEdit',          "projectID=$program->id&programID=0&from=program", $program, 'list', 'edit', '', '', '', "data-group='program'");?>
           <?php common::printIcon('program', 'PRJManageMembers', "projectID=$program->id", $program, 'list', 'group');?>
           <?php common::printIcon('program', 'PRJGroup',         "projectID=$program->id", $program, 'list', 'lock');?>
           <div class='btn-group'>
diff --git a/module/program/view/prjedit.html.php b/module/program/view/prjedit.html.php
index 3281da3545..a7201ba3fe 100644
--- a/module/program/view/prjedit.html.php
+++ b/module/program/view/prjedit.html.php
@@ -19,6 +19,7 @@
 <?php js::set('projectID', $project->id);?>
 <?php js::set('PGMChangeTips', $lang->program->PGMChangeTips);?>
 <?php js::set('longTime', $lang->program->PRJLongTime);?>
+<?php js::set('from', $from);?>
 <?php $aclList = $project->parent ? $lang->program->PGMPRJAclList : $lang->program->PRJAclList;?>
 <?php $requiredFields = $config->program->PRJEdit->requiredFields;?>
 <div id='mainContent' class='main-content'>