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

Merge branch 'cyy_gitlab' into 'master'

Browse Source 
* Modify gitlab access check.

See merge request easycorp/zentaopms!4346
This commit is contained in:
李玉春
2022-07-06 00:17:14 +00:00
parent 781259ee6f 6557ff6ddf
commit 7838ff2ac6
8 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/control.php
+5 -1
View File
@@ -714,7 +714,10 @@ class gitlab extends control
$project->isMaintainer = $this->gitlab->checkUserAccess($gitlabID, $project->id, $project, $groupIDList, 'maintainer');
}
$gitlab = $this->gitlab->getByID($gitlabID);
$gitlab = $this->gitlab->getByID($gitlabID);
$repos = $this->loadModel('repo')->getGitLabRepoList($gitlabID);
$repoPairs = array();
foreach($repos as $repo) $repoPairs[$repo->path] = $repo->id;
$this->view->gitlab = $gitlab;
$this->view->keyword = urldecode(urldecode($keyword));
@@ -723,6 +726,7 @@ class gitlab extends control
$this->view->gitlabID = $gitlabID;
$this->view->gitlabProjectList = $result['projects'];
$this->view->orderBy = $orderBy;
$this->view->repoPairs = $repoPairs;
$this->display();
}