From 24875e31c9e778b62eb16319fc72daa7b193ab36 Mon Sep 17 00:00:00 2001 From: dingyongliang Date: Wed, 30 Oct 2024 10:03:41 +0800 Subject: [PATCH] * [bug#56551] doc quickmenu dont use link. --- lib/zin/wg/docapp/js/v1.js | 4 ++-- module/product/control.php | 6 +++--- module/project/control.php | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/zin/wg/docapp/js/v1.js b/lib/zin/wg/docapp/js/v1.js index e81035c54d..715287c090 100644 --- a/lib/zin/wg/docapp/js/v1.js +++ b/lib/zin/wg/docapp/js/v1.js @@ -1192,12 +1192,12 @@ function getSpaceFetcher(spaceType, spaceID = 0) { if(spaceType === 'product') { - return $.createLink('product', 'ajaxGetDropMenu', `productID=${spaceID}&module=doc&method=app`); + return $.createLink('product', 'ajaxGetDropMenu', `productID=${spaceID}&module=doc&method=app&extra=&from=&useLink=0`); } if(spaceType === 'project') { - return $.createLink('project', 'ajaxGetDropMenu', `projectID=${spaceID}&module=doc&method=app`); + return $.createLink('project', 'ajaxGetDropMenu', `projectID=${spaceID}&module=doc&method=app&extra=&useLink=0`); } } diff --git a/module/product/control.php b/module/product/control.php index b866bb1710..d79cd71e2e 100755 --- a/module/product/control.php +++ b/module/product/control.php @@ -952,7 +952,7 @@ class product extends control { $projects = $this->product->getProjectPairsByProduct($productID, $branch); if($this->app->getViewType() == 'json') return print(json_encode($projects)); - if($pageType == 'old') return print(html::select('project', array(0 => '') + $projects, $projectID, "class='form-control' onchange='loadProductExecutions({$productID}, this.value)'"));; + if($pageType == 'old') return print(html::select('project', array(0 => '') + $projects, $projectID, "class='form-control' onchange='loadProductExecutions({$productID}, this.value)'")); $items = array(); foreach($projects as $projectID => $projectName) $items[] = array('text' => $projectName, 'value' => $projectID, 'keys' => $projectName); @@ -1134,7 +1134,7 @@ class product extends control * @access public * @return void */ - public function ajaxGetDropMenu(int $productID, string $module, string $method, string $extra = '', string $from = '') + public function ajaxGetDropMenu(int $productID, string $module, string $method, string $extra = '', string $from = '', int $useLink = 1) { $shadow = '0'; if($this->app->tab == 'qa' || $from == 'qa') $shadow = 'all'; @@ -1143,7 +1143,7 @@ class product extends control $programProducts = array(); foreach($products as $product) $programProducts[$product->program][] = $product; - $this->view->link = $this->product->getProductLink($module, $method, $extra); + $this->view->link = $useLink == 1 ? $this->product->getProductLink($module, $method, $extra) : '#'; $this->view->productID = $productID; $this->view->module = $module; $this->view->method = $method; diff --git a/module/project/control.php b/module/project/control.php index 8f9df25dc3..20902fa849 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -96,7 +96,7 @@ class project extends control * @access public * @return void */ - public function ajaxGetDropMenu(int $projectID, string $module, string $method, string $extra = '') + public function ajaxGetDropMenu(int $projectID, string $module, string $method, string $extra = '', int $useLink = 1) { /* Set cookie for show all project. */ $_COOKIE['showClosed'] = 1; @@ -116,7 +116,7 @@ class project extends control $orderedProjects[$project->parent][] = $project; } - $this->view->link = $this->project->getProjectLink($module, $method, $projectID, $extra); // Create the link from module,method. + $this->view->link = $useLink == 1 ? $this->project->getProjectLink($module, $method, $projectID, $extra) : '#'; // Create the link from module,method. $this->view->projectID = $projectID; $this->view->module = $module; $this->view->method = $method;