From c783202435571e1fb51ec72e47a08e765f0656ef Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 26 Apr 2021 16:10:58 +0800
Subject: [PATCH]  * Fix bug #12399.

---
 module/project/control.php        | 1 +
 module/project/view/view.html.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/project/control.php b/module/project/control.php
index 0a4c927da4..d379839dd4 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -443,6 +443,7 @@ class project extends control
             }
 
             $locateLink = $this->session->projectList ? $this->session->projectList : inLink('view', "projectID=$projectID");
+            if($from == 'projectView')    $locateLink = $this->createLink('project', 'view', "projectID=$projectID");
             if($from == 'program')        $locateLink = $this->createLink('program', 'browse');
             if($from == 'programProject') $locateLink = $this->session->programProject ? $this->session->programProject : $this->createLink('program', 'project', "projectID=$projectID");
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index a4143dd277..1971fd3e05 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -104,7 +104,7 @@
             echo $this->buildOperateMenu($project, 'view');
 
             echo "<div class='divider'></div>";
-            common::printIcon('project', 'edit', $params, $project, 'button', 'edit', '', '', '', '', $lang->edit);
+            common::printIcon('project', 'edit', $params . '&from=projectView', $project, 'button', 'edit', '', '', '', '', $lang->edit);
             common::printIcon('project', 'delete', $params, $project, 'button', 'trash', 'hiddenwin', '', '', '', $lang->delete);
         }
         ?>