From 48c052efadb32f562d2cb609d4ad87cd73842b43 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Mon, 16 May 2022 09:23:29 +0000
Subject: [PATCH] * Fix bug #22531.

---
 lib/base/front/front.class.php | 5 +----
 module/bug/model.php           | 2 +-
 module/bug/view/view.html.php  | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php
index a2ebdd9851..1e51691d89 100644
--- a/lib/base/front/front.class.php
+++ b/lib/base/front/front.class.php
@@ -509,10 +509,7 @@ class baseHTML
             setcookie('goback', json_encode($gobackList), $config->cookieLife, $config->webRoot, '', $config->cookieSecure, false);
         }
 
-        $dataApp = array_search($gobackLink, $gobackList) ? array_search($gobackLink, $gobackList) : '';
-        $dataApp = empty($dataApp) ? '' : "data-app='$dataApp'";
-
-        return "<a href='{$gobackLink}' class='btn btn-back $class' $dataApp $misc>{$label}</a>";
+        return "<a href='{$gobackLink}' class='btn btn-back $class' data-app='$tab' $misc>{$label}</a>";
     }
 
     /**
diff --git a/module/bug/model.php b/module/bug/model.php
index 9ff6b81d69..0062ffdc16 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -3281,7 +3281,7 @@ class bugModel extends model
         if($type == 'view') $menu .= $this->buildMenu('bug', 'activate', $params, $bug, $type, '', '', "text-success iframe showinonlybody", true);
         if($type == 'view' && $this->app->tab != 'product')
         {
-            $menu .= $this->buildMenu('bug', 'toStory', $toStoryParams, $bug, $type, $this->lang->icons['story'], '', '', '', "data-app='product'", $this->lang->bug->toStory);
+            $menu .= $this->buildMenu('bug', 'toStory', $toStoryParams, $bug, $type, $this->lang->icons['story'], '', '', '', "data-app='qa'", $this->lang->bug->toStory);
             $menu .= $this->buildMenu('bug', 'createCase', $convertParams, $bug, $type, 'sitemap');
         }
         if($type == 'view')
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index b7f0629533..1d52f7da9c 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -217,7 +217,7 @@
                   <th><?php echo $lang->bug->deadline;?></th>
                   <td>
                     <?php
-                    if($bug->deadline) echo  $bug->deadline;
+                    if($bug->deadline) echo $bug->deadline;
                     if(isset($bug->delay)) printf($lang->bug->delayWarning, $bug->delay);
                     ?>
                   </td>