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

* Adjust sonar issue for mr.

Browse Source
This commit is contained in:
caoyanyi
2023-11-30 08:52:54 +08:00
parent a1a7be4aa0
commit b9868c6955
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+1 -1
View File
@@ -56,7 +56,7 @@ class mr extends control
$this->session->set('execution', $objectID);
$execution = $this->loadModel('execution')->getByID($objectID);
$features = $this->execution->getExecutionFeatures($execution);
if(!$features['devops']) return $this->locate($this->createLink('execution', 'task', "objectID=$executionID"));
if(!$features['devops']) return $this->locate($this->createLink('execution', 'task', "objectID=$objectID"));
$this->loadModel('execution')->setMenu($objectID);
}
module/mr/ui/browse.html.php
+2 -1
View File
@@ -59,6 +59,7 @@ featureBar
set::linkParams("repoID={$repo->id}&mode=status&param={key}")
);
$linkParams = $app->tab == 'devops' ? "repoID={$repo->id}" : '';
toolBar
(
hasPriv('mr', 'create') ? item(set(array
@@ -66,7 +67,7 @@ toolBar
'text' => $lang->mr->create,
'icon' => 'plus',
'class' => 'btn primary',
'url' => createLink('mr', 'create', $app->tab == 'devops' ? "repoID={$repo->id}" : '')
'url' => createLink('mr', 'create', $linkParams)
))) : null
);
module/mr/zen.php
+1 -1
View File
@@ -178,7 +178,7 @@ class mrZen extends mr
* @access protected
* @return void
*/
protected function buildLinkTaskSearchForm(int $MRID, object $product, string $orderBy, int $queryID = 0, array $productExecutions)
protected function buildLinkTaskSearchForm(int $MRID, object $product, string $orderBy, int $queryID, array $productExecutions)
{
$modules = $this->loadModel('tree')->getOptionMenu($product->id, 'task');