diff --git a/module/mr/control.php b/module/mr/control.php index 5ac9a13342..fc955bfb70 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -216,7 +216,7 @@ class mr extends control $repoID = $this->loadModel('repo')->saveState($repoID); $repo = $this->repo->getByID($repoID); - $project = $this->loadModel(strtolower($repo->SCM))->apiGetSingleProject($repo->gitService, $repo->serviceProject); + $project = $this->loadModel(strtolower($repo->SCM))->apiGetSingleProject($repo->gitService, $repo->serviceProject, false); $jobPairs = array(); $jobs = $this->loadModel('job')->getListByRepoID($repoID); diff --git a/module/mr/ui/browsebyexecution.html.php b/module/mr/ui/browsebyexecution.html.php index 6a3ceb53cc..547dfe04dc 100644 --- a/module/mr/ui/browsebyexecution.html.php +++ b/module/mr/ui/browsebyexecution.html.php @@ -13,6 +13,11 @@ namespace zin; jsVar('orderBy', $orderBy); jsVar('sortLink', $sortLink); +dropmenu +( + set::url(createLink('execution', 'ajaxGetDropMenuData', "objectID=$objectID&module={$app->rawModule}&method={$app->rawMethod}")) +); + foreach($MRList as $index => $MR) { if(!isset($repoList[$MR->repoID])) diff --git a/module/mr/ui/create.html.php b/module/mr/ui/create.html.php index ce532049cd..bf330a2e4a 100644 --- a/module/mr/ui/create.html.php +++ b/module/mr/ui/create.html.php @@ -20,7 +20,13 @@ jsVar('mrLang', $lang->mr); jsVar('branchPrivs', array()); jsVar('projectNamespace', in_array($repo->SCM, array('Gitea', 'Gogs')) ? $project->name_with_namespace : ''); -if($app->tab == 'devops') dropmenu(set::objectID($repo->id), set::text($repo->name), set::tab('repo')); +$module = $app->tab == 'devops' ? 'repo' : $app->tab; +dropmenu +( + set::module($module), + set::tab($module), + set::url(createLink($module, $app->tab == 'devops' ? 'ajaxGetDropMenu' : 'ajaxGetDropMenuData', "objectID=$objectID&module={$app->rawModule}&method={$app->rawMethod}")) +); if(in_array($repo->SCM, array('Gitea', 'Gogs'))) { diff --git a/module/mr/ui/diff.html.php b/module/mr/ui/diff.html.php index 992314fe49..b15acacd42 100644 --- a/module/mr/ui/diff.html.php +++ b/module/mr/ui/diff.html.php @@ -10,7 +10,13 @@ declare(strict_types=1); */ namespace zin; -dropmenu(set::objectID($MR->repoID), set::tab('repo')); +$module = $app->tab == 'devops' ? 'repo' : $app->tab; +dropmenu +( + set::module($module), + set::tab($module), + set::url(createLink($module, $app->tab == 'devops' ? 'ajaxGetDropMenu' : 'ajaxGetDropMenuData', "objectID=$objectID&module={$app->rawModule}&method={$app->rawMethod}")) +); detailHeader ( diff --git a/module/mr/ui/edit.html.php b/module/mr/ui/edit.html.php index df4f5d1aa6..3dce92c221 100644 --- a/module/mr/ui/edit.html.php +++ b/module/mr/ui/edit.html.php @@ -14,6 +14,14 @@ h::importJs('js/misc/base64.js'); jsVar('hostID', $MR->hostID); jsVar('projectID', $MR->sourceProject); +$module = $app->tab == 'devops' ? 'repo' : $app->tab; +dropmenu +( + set::module($module), + set::tab($module), + set::url(createLink($module, $app->tab == 'devops' ? 'ajaxGetDropMenu' : 'ajaxGetDropMenuData', "objectID=$objectID&module={$app->rawModule}&method={$app->rawMethod}")) +); + $hostName = $this->loadModel('pipeline')->getByID($MR->hostID)->name; $sourceProject = $host->type == 'gitlab' ? $this->loadModel('gitlab')->apiGetSingleProject($MR->hostID, $MR->sourceProject)->name_with_namespace : $MR->sourceProject; $targetProject = $host->type == 'gitlab' ? $this->loadModel('gitlab')->apiGetSingleProject($MR->hostID, $MR->targetProject)->name_with_namespace : $MR->targetProject; diff --git a/module/mr/ui/link.html.php b/module/mr/ui/link.html.php index b852b9af06..d1ed9f0935 100644 --- a/module/mr/ui/link.html.php +++ b/module/mr/ui/link.html.php @@ -11,7 +11,14 @@ declare(strict_types=1); namespace zin; $repoName = $this->dao->select('name')->from(TABLE_REPO)->where('id')->eq($MR->repoID)->fetch('name'); -dropmenu(set::objectID($MR->repoID), set::text($repoName), set::tab('repo')); + +$module = $app->tab == 'devops' ? 'repo' : $app->tab; +dropmenu +( + set::module($module), + set::tab($module), + set::url(createLink($module, $app->tab == 'devops' ? 'ajaxGetDropMenu' : 'ajaxGetDropMenuData', "objectID=$objectID&module={$app->rawModule}&method={$app->rawMethod}")) +); jsVar('type', $type); jsVar('orderBy', $orderBy); diff --git a/module/mr/ui/view.html.php b/module/mr/ui/view.html.php index d487e59ec2..d44c0d6c43 100644 --- a/module/mr/ui/view.html.php +++ b/module/mr/ui/view.html.php @@ -10,7 +10,13 @@ declare(strict_types=1); */ namespace zin; -dropmenu(set::objectID($MR->repoID), set::tab('repo')); +$module = $app->tab == 'devops' ? 'repo' : $app->tab; +dropmenu +( + set::module($module), + set::tab($module), + set::url(createLink($module, $app->tab == 'devops' ? 'ajaxGetDropMenu' : 'ajaxGetDropMenuData', "objectID=$objectID&module={$app->rawModule}&method={$app->rawMethod}")) +); $hasNoConflict = $MR->synced === '1' ? $rawMR->has_conflicts : (bool)$MR->hasNoConflict; $sourceDisabled = ($MR->status == 'merged' && $MR->removeSourceBranch == '1') ? 'disabled' : '';