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

---
 module/common/lang/zh-cn.php                 |  2 +-
 module/program/control.php                   | 18 ++++++++++++------
 module/program/view/pgmbrowsebylist.html.php |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index c97683113e..537e627496 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -148,7 +148,7 @@ $lang->dividerMenu = ',project,doc,';
 $lang->program = new stdclass();
 $lang->program->menu = new stdclass();
 //$lang->program->menu->index   = '主页|program|pgmindex|';
-$lang->program->menu->browse  = array('link' => '项目集|program|pgmbrowse|', 'alias' => 'pgmcreate,pgmedit,pgmgroup,pgmmanagepriv,pgmmanageview,pgmmanagemembers,prjcreate');
+$lang->program->menu->browse  = array('link' => '项目集|program|pgmbrowse|', 'alias' => 'pgmcreate,pgmedit,pgmgroup,pgmmanagepriv,pgmmanageview,pgmmanagemembers,prjcreate,prjedit');
 
 $lang->PRJ = new stdclass();
 $lang->PRJ->menu = new stdclass();
diff --git a/module/program/control.php b/module/program/control.php
index 4abe7be4e4..0876c039a8 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -914,18 +914,18 @@ class program extends control
      *
      * @param  int    $projectID
      * @param  int    $programID
-     * @param  string $from  project|program
+     * @param  string $from  PRJ|PGM
      * @access public
      * @return void
      */
-    public function PRJEdit($projectID = 0, $programID = 0, $from = 'project')
+    public function PRJEdit($projectID = 0, $programID = 0, $from = 'PRJ')
     {
         $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($from == 'PGM') $this->lang->PRJ->menu = $this->lang->program->menu;
 
         if($_POST)
         {
@@ -938,9 +938,15 @@ class program extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $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));
+            if($from == 'PGM')
+            {
+                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('PGMBrowse')));
+            }
+            else
+            {
+                $url = $this->session->PRJBrowse ? $this->session->PRJBrowse : inLink('PRJBrowse');
+                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $url));
+            }
         }
 
         $project = $this->program->getPRJByID($projectID);
diff --git a/module/program/view/pgmbrowsebylist.html.php b/module/program/view/pgmbrowsebylist.html.php
index b54fffea5b..14e5217f66 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&programID=0&from=program", $program, 'list', 'edit', '', '', '', "data-group='program'");?>
+          <?php common::printIcon('program', 'PRJEdit',          "projectID=$program->id&programID=0&from=PGM", $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'>