From f4591051298acf2369aa043bb85ad8f1995ace18 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 31 Aug 2021 09:12:58 +0800
Subject: [PATCH] * Modify dynamic back link problem.

---
 lib/base/front/front.class.php       | 6 +-----
 module/execution/control.php         | 1 +
 module/product/view/project.html.php | 4 ++--
 module/project/control.php           | 1 +
 module/story/control.php             | 4 +++-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php
index c1e9d597f3..a81a355823 100644
--- a/lib/base/front/front.class.php
+++ b/lib/base/front/front.class.php
@@ -490,11 +490,7 @@ class baseHTML
         if(helper::inOnlyBodyMode()) return false;
 
         global $lang, $app, $config;
-        if(empty($label))
-        {
-            global $lang, $config;
-            $label = $lang->goback;
-        }
+        if(empty($label)) $label = $lang->goback;
 
         $tab           = $_COOKIE['tab'];
         $referer       = strtolower($_SERVER['HTTP_REFERER']);
diff --git a/module/execution/control.php b/module/execution/control.php
index 88ec2bcdb4..44e9d9622c 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2560,6 +2560,7 @@ class execution extends control
         $this->session->set('bugList',         $uri, 'qa');
         $this->session->set('caseList',        $uri, 'qa');
         $this->session->set('testtaskList',    $uri, 'qa');
+        $this->session->set('reportList',      $uri, 'qa');
 
         /* use first execution if executionID does not exist. */
         if(!isset($this->executions[$executionID])) $executionID = key($this->executions);
diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index ba1bbe14db..b904de65bf 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -55,11 +55,11 @@
             <?php
             if($config->systemMode == 'new')
             {
-                echo html::a($this->createLink('project', 'index', 'project=' . $project->id), $project->name, '_parent');
+                echo html::a($this->createLink('project', 'index', 'project=' . $project->id), $project->name);
             }
             else
             {
-                echo html::a($this->createLink('execution', 'task', 'project=' . $project->id), $project->name, '_parent');
+                echo html::a($this->createLink('execution', 'task', 'project=' . $project->id), $project->name);
             }
             ?>
           </td>
diff --git a/module/project/control.php b/module/project/control.php
index f372999724..146c5944df 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -743,6 +743,7 @@ class project extends control
         $this->session->set('bugList',         $uri, 'qa');
         $this->session->set('caseList',        $uri, 'qa');
         $this->session->set('testtaskList',    $uri, 'qa');
+        $this->session->set('reportList',      $uri, 'qa');
 
         if(isset($this->config->maxVersion))
         {
diff --git a/module/story/control.php b/module/story/control.php
index 923e3b795e..ee6c31c31a 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -898,7 +898,9 @@ class story extends control
      */
     public function view($storyID, $version = 0, $param = 0)
     {
-        $this->session->set('productList', $this->app->getURI(true) . "#app={$this->app->tab}", 'product');
+        $uri = $this->app->getURI(true);
+        $this->session->set('productList',     $uri . "#app={$this->app->tab}", 'product');
+        $this->session->set('productPlanList', $uri, 'product');
 
         $storyID = (int)$storyID;
         $story   = $this->story->getById($storyID, $version, true);