From fce763fa42142086e7bb4e8496b25eeace90bc50 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Sat, 20 Feb 2021 13:36:02 +0800
Subject: [PATCH] * Finish task #36048.

---
 module/product/control.php                   | 17 +++++++++--------
 module/product/view/ajaxgetdropmenu.html.php |  7 ++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 4522a75006..29b1483caf 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -880,14 +880,15 @@ class product extends control
         $inProduct = zget($this->lang->navGroup, $module) == 'product';
         $products  = $inProduct ? $this->product->getList() : $this->product->getProductsByProject($this->session->PRJ);
 
-        $this->view->link      = $this->product->getProductLink($module, $method, $extra);
-        $this->view->productID = $productID;
-        $this->view->module    = $module;
-        $this->view->method    = $method;
-        $this->view->extra     = $extra;
-        $this->view->products  = $products;
-        $this->view->projectID = $this->session->PRJ;
-        $this->view->programs  = $this->loadModel('program')->getPGMOption();
+        $this->view->link       = $this->product->getProductLink($module, $method, $extra);
+        $this->view->productID  = $productID;
+        $this->view->module     = $module;
+        $this->view->method     = $method;
+        $this->view->extra      = $extra;
+        $this->view->products   = $products;
+        $this->view->projectID  = $this->session->PRJ;
+        $this->view->programs   = $this->loadModel('program')->getPGMOption();
+        $this->view->openModule = $inProduct ? 'product' : 'project';
         $this->display();
     }
 
diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index 984bd1f8db..b5fa80fce9 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -7,6 +7,7 @@ $iCharges = 0;
 $others   = 0;
 $closeds  = 0;
 $productNames = array();
+
 foreach($products as $product)
 {
     if($product->status == 'normal' and $product->PO == $this->app->user->account) $iCharges++;
@@ -26,19 +27,19 @@ foreach($products as $product)
     {
         $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
         $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
-        $myProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $productName, '', "class='text-important' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='product'");
+        $myProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $productName, '', "class='text-important' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openModule'");
     }
     else if($product->status == 'normal' and !($product->PO == $this->app->user->account))
     {
         $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
         $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
-        $normalProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $productName, '', "title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='product'");
+        $normalProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $productName, '', "title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openModule'");
     }
     else if($product->status == 'closed')
     {
         $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
         $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $objectID);
-        $closedProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $productName, '', "title='{$productName}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='product'");
+        $closedProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $productName, '', "title='{$productName}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openModule'");
     }
 }
 ?>