From 71a55f5dcf2c02fc67979c4a0653e8a517c437a4 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 1 Jun 2022 01:37:18 +0000
Subject: [PATCH] * Finish task #55623.

---
 module/bug/control.php                   | 2 +-
 module/bug/view/ajaxgetdropmenu.html.php | 2 +-
 module/product/model.php                 | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 33c4542722..1fbfe7977f 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -2293,7 +2293,7 @@ class bug extends control
     public function ajaxGetDropMenu($productID, $module, $method, $extra = '')
     {
         $products = array();
-        if(!empty($extra)) $products = $this->product->getProducts($extra, $this->config->CRProduct ? 'all' : 'noclosed', 'program desc, line desc, ');
+        if(!empty($extra)) $products = $this->product->getProducts($extra, 'all', 'program desc, line desc, ');
 
         $this->view->link      = $this->product->getProductLink($module, $method, $extra);
         $this->view->productID = $productID;
diff --git a/module/bug/view/ajaxgetdropmenu.html.php b/module/bug/view/ajaxgetdropmenu.html.php
index 193a1609eb..7315c653b6 100644
--- a/module/bug/view/ajaxgetdropmenu.html.php
+++ b/module/bug/view/ajaxgetdropmenu.html.php
@@ -17,7 +17,7 @@ foreach($products as $product)
 }
 $productsPinYin = common::convert2Pinyin($productNames);
 $linkHtml       = $this->product->setParamsForLink($module, $link, $projectID, 0);
-$productsHtml   = html::a($linkHtml, $this->lang->bug->allProduct, '', "class='text-important' title='{$this->lang->bug->allProduct}' data-key='" . zget($productsPinYin, $this->lang->bug->allProduct, '') . "' data-app='{$this->app->tab}'");
+$productsHtml   = count($products) > 1 ? html::a($linkHtml, $this->lang->bug->allProduct, '', "class='text-important' title='{$this->lang->bug->allProduct}' data-key='" . zget($productsPinYin, $this->lang->bug->allProduct, '') . "' data-app='{$this->app->tab}'") : '';
 
 foreach($products as $product)
 {
diff --git a/module/product/model.php b/module/product/model.php
index a2eabf8c8b..08bde991e3 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -77,6 +77,12 @@ class productModel extends model
     {
         $isQaModule = (strpos(',project,execution,', ",{$this->app->tab},") !== false and strpos(',bug,testcase,testtask,ajaxselectstory,', ",{$this->app->rawMethod},") !== false and isset($products[0])) ? true : false;
 
+        if(count($products) <= 2 and isset($products[0]))
+        {
+            unset($products[0]);
+            $productID = key($products);
+        }
+
         $this->app->loadLang('product');
         if(!$isQaModule and !$productID)
         {