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

* Fix bug #40061.

Browse Source
This commit is contained in:
caoyanyi
2023-11-02 10:10:06 +08:00
parent 736b3eb265
commit 1cbc633020
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+8 -3
View File
@@ -169,15 +169,19 @@ class mr extends control
$this->app->loadClass('pager', true);
$pager = new pager($recTotal, $recPerPage, $pageID);
$MRList = $this->mr->getList($mode, $param, $orderBy, array(), 0, $executionID, $pager);
$MRList = $this->mr->getList($mode, $param, $orderBy, array(), $repoID, $executionID, $pager);
$repoList = $this->loadModel('repo')->getList($executionID);
$MRList = $this->mr->batchSyncMR($MRList, $repoList);
$projects = array();
$projects = array();
$repoPairs = array($this->lang->repo->common);
foreach($repoList as $repo)
{
if($repo->SCM == 'Subversion') continue;
$repoPairs[$repo->id] = $repo->name;
if($repoID && $repoID != $repo->id) continue;
if($repo->SCM == 'Gitlab')
{
$projectIds = array();
@@ -202,16 +206,17 @@ class mr extends control
$openIDList += $this->loadModel('gogs')->getGogsListByAccount($this->app->user->account);
}
$this->view->title = $this->lang->mr->common . $this->lang->colon . $this->lang->mr->browse;
$this->view->MRList = $MRList;
$this->view->projects = $projects;
$this->view->pager = $pager;
$this->view->mode = $mode;
$this->view->repoID = $repoID;
$this->view->param = $param;
$this->view->objectID = $executionID;
$this->view->executionID = $executionID;
$this->view->repoList = $repoList;
$this->view->repoPairs = $repoPairs;
$this->view->orderBy = $orderBy;
$this->view->openIDList = $openIDList;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
module/mr/css/common.ui.css
+1 -1
View File
@@ -1,3 +1,3 @@
.mr-linkstory-title {background-color: #e6f0ff; color: #2e7fff; padding: 12px 6px 12px;}
#log .action-btn .caret {display: none; color: red}
.dropmenu-btn>.text {max-width: 280px;}
.dropmenu-btn > .text {max-width: 280px;}
module/mr/ui/browsebyexecution.html.php
+13 -2
View File
@@ -69,7 +69,18 @@ $MRs = initTableData($MRList, $config->mr->dtable->fieldList, $this->mr);
featureBar
(
set::current($mode != 'status' ? $mode : $param),
set::linkParams("repoID=0&mode=status&param={key}&objectID={$objectID}"),
set::linkParams("repoID={$repoID}&mode=status&param={key}&objectID={$objectID}"),
empty($repoPairs) ? null : to::leading(
productMenu
(
setClass('w-36'),
set::title($lang->repo->common),
set::items($repoPairs),
set::activeKey($repoID),
set::closeLink(createLink('mr', 'browse', "repoID=0&mode={$mode}&param={$param}&objectID={$objectID}")),
set::link(createLink('mr', 'browse', "repoID={key}&mode={$mode}&param={$param}&objectID={$objectID}") . "#app={$app->tab}")
)
)
);
toolBar
@@ -78,7 +89,7 @@ toolBar
set::text($lang->mr->create),
set::icon('plus'),
set::className('btn primary'),
set::url(createLink('mr', 'create', "repoID=" . key($repoList) . "&objectID={$objectID}")),
set::url(createLink('mr', 'create', "repoID=" . ($repoID ? $repoID : key($repoList)) . "&objectID={$objectID}")),
set('data-app', $app->tab)
) : null,
);