From 2253d59efa4be9342e313c154c123c4d7372741b Mon Sep 17 00:00:00 2001
From: liuruogu <liuruogu@easycorp.ltd>
Date: Thu, 22 Sep 2022 02:07:58 +0000
Subject: [PATCH 1/3]  * Fix bug for menu light.

---
 module/story/view/view.html.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index d2046cf814..15f43eff7a 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -58,6 +58,10 @@
         $otherParam = "storyID=&projectID={$this->session->project}";
         $tab        = 'project';
     }
+    else if($this->app->rawModule == 'execution')
+    {
+        $tab = 'execution';
+    }
     ?>
     <?php common::printLink('story', 'create', "productID={$story->product}&branch={$story->branch}&moduleID={$story->module}&$otherParam&bugID=0&planID=0&todoID=0&extra=&type=$story->type", "<i class='icon icon-plus'></i> " . $lang->story->create, '', "class='btn btn-primary' data-app='$tab'"); ?>
     <?php endif;?>

From 6bb82640f66d547231ecaa484b184390ef2355d1 Mon Sep 17 00:00:00 2001
From: liuruogu <liuruogu@easycorp.ltd>
Date: Thu, 22 Sep 2022 02:28:22 +0000
Subject: [PATCH 2/3]  * Fix bug #27665.

---
 module/product/model.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/module/product/model.php b/module/product/model.php
index 9766fa8cf8..dd414bc116 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1136,12 +1136,14 @@ class productModel extends model
         $productIdList = ($this->app->tab == 'project' and empty($productID)) ? array_keys($products) : $productID;
         $branchParam   = ($this->app->tab == 'project' and empty($productID)) ? '' : $branch;
         $projectID     = ($this->app->tab == 'project' and empty($projectID)) ? $this->session->project : $projectID;
+        $productInfo   = $this->getById($productID);
 
         $this->config->product->search['actionURL'] = $actionURL;
         $this->config->product->search['queryID']   = $queryID;
         $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productIdList, $branchParam);
 
-        $product = ($this->app->tab == 'project' and empty($productID)) ? $products : array($productID => $products[$productID]);
+        $product = ($this->app->tab == 'project' and empty($productID)) ? $products : array($productID => $productInfo->name);
+
         $this->config->product->search['params']['product']['values'] = $product + array('all' => $this->lang->product->allProduct);
 
         /* Get modules. */
@@ -1186,7 +1188,6 @@ class productModel extends model
         }
         $this->config->product->search['params']['module']['values'] = array('' => '') + $modules;
 
-        $productInfo = $this->getById($productID);
         if(!$productID or $productInfo->type == 'normal' or $this->app->tab == 'assetlib')
         {
             unset($this->config->product->search['fields']['branch']);
@@ -1198,6 +1199,8 @@ class productModel extends model
             $this->config->product->search['params']['branch']['values']  = array('' => '', '0' => $this->lang->branch->main) + $this->loadModel('branch')->getPairs($productID, 'noempty');
         }
 
+        if(!empty($productInfo->shadow)) unset($this->config->product->search['fields']['product']);
+
         $this->loadModel('search')->setSearchParams($this->config->product->search);
     }
 

From ac32bd02614bacf08b53a67f3d1237e8e666dee7 Mon Sep 17 00:00:00 2001
From: liuruogu <liuruogu@easycorp.ltd>
Date: Thu, 22 Sep 2022 05:07:51 +0000
Subject: [PATCH 3/3]  * Fix bug #27751.

---
 module/tree/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/tree/model.php b/module/tree/model.php
index 8c8a2582ec..da53c8ffd9 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -445,7 +445,7 @@ class treeModel extends model
             {
                 $this->buildTree($treeMenu, $module, $type, $userFunc, $extra, $branch);
             }
-            elseif(isset($executionModules[$module->id]))
+            elseif(isset($executionModules[$module->id]) || !empty($product->shadow))
             {
                 $this->buildTree($treeMenu, $module, $type, $userFunc, $extra, $branch);
             }