Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #55623.

Browse Source
This commit is contained in:
zhouxudong
2022-06-01 01:37:18 +00:00
parent 4e913acb10
commit 71a55f5dcf
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+1 -1
View File
@@ -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;
module/bug/view/ajaxgetdropmenu.html.php
+1 -1
View File
@@ -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)
{
module/product/model.php
+6
View File
@@ -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)
{