From 969b07b61b4b70bc1273fb957e71cb93c82507e4 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Mon, 25 Dec 2023 17:04:59 +0800
Subject: [PATCH] * Fix bug #41983.

---
 module/design/control.php                   |  1 +
 module/design/model.php                     | 17 +++++++----------
 module/design/view/ajaxgetdropmenu.html.php |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/module/design/control.php b/module/design/control.php
index 2f31250341..3816243866 100755
--- a/module/design/control.php
+++ b/module/design/control.php
@@ -186,6 +186,7 @@ class design extends control
         $this->view->stories    = $this->loadModel('story')->getExecutionStoryPairs($projectID);
         $this->view->productID  = $productID;
         $this->view->projectID  = $projectID;
+        $this->view->project    = $project;
         $this->view->type       = $type;
         $this->view->typeList   = $project->model == 'waterfall' ? $this->lang->design->typeList : $this->lang->design->plusTypeList;
 
diff --git a/module/design/model.php b/module/design/model.php
index 095c2e26fe..1a6886605f 100755
--- a/module/design/model.php
+++ b/module/design/model.php
@@ -449,22 +449,19 @@ class designModel extends model
 
         if($this->app->rawMethod == 'browse') $this->lang->waterfall->menu->design['subMenu']->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $this->lang->searchAB . '</a>');
 
-        if(empty($products) || !$productID) return '';
+        if(empty($products)) return '';
 
-        if($productID)
-        {
-            $currentProduct = $this->loadModel('product')->getById($productID);
-            setCookie("lastProduct", $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
-        }
-        else
+        $currentProduct = $this->loadModel('product')->getById($productID);
+        setCookie("lastProduct", $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        $currentProduct = $this->loadModel('product')->getById($productID);
+        if(!empty($currentProduct->shadow)) return '';
+
+        if(!$productID)
         {
             $currentProduct = new stdclass();
             $currentProduct->name = $this->lang->product->all;
         }
 
-        $currentProduct = $this->loadModel('product')->getById($productID);
-        if(!empty($currentProduct->shadow)) return '';
-
         $output = '';
         if(!empty($products))
         {
diff --git a/module/design/view/ajaxgetdropmenu.html.php b/module/design/view/ajaxgetdropmenu.html.php
index 3b91968cba..66a7d6d800 100755
--- a/module/design/view/ajaxgetdropmenu.html.php
+++ b/module/design/view/ajaxgetdropmenu.html.php
@@ -69,7 +69,7 @@ foreach($products as $product)
 <script>
 $(function()
 {
-    <?php if($currentProduct->status == 'closed'):?>
+    <?php if($productID && $currentProduct->status == 'closed'):?>
     $('.col-footer .toggle-right-col').click(function(){ scrollToSelected(); })
     <?php else:?>
     scrollToSelected();