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

* [bug#56551] doc quickmenu dont use link.

Browse Source
This commit is contained in:
dingyongliang
2024-11-01 14:30:59 +08:00
committed by 谢杞钰
parent ebe920fad7
commit 24875e31c9
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zin/wg/docapp/js/v1.js
+2 -2
View File
@@ -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`);
}
}
module/product/control.php
+3 -3
View File
@@ -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;
module/project/control.php
+2 -2
View File
@@ -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;