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

* Adjust 1.5 nav for mr page.

Browse Source
This commit is contained in:
caoyanyi
2023-11-01 14:47:07 +08:00
parent 09306de2e9
commit f422dcb1e5
7 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+1 -1
View File
@@ -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);
module/mr/ui/browsebyexecution.html.php
+5
View File
@@ -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]))
module/mr/ui/create.html.php
+7 -1
View File
@@ -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')))
{
module/mr/ui/diff.html.php
+7 -1
View File
@@ -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
(
module/mr/ui/edit.html.php
+8
View File
@@ -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;
module/mr/ui/link.html.php
+8 -1
View File
@@ -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);
module/mr/ui/view.html.php
+7 -1
View File
@@ -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' : '';