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

Merge branch 'cyy_bug' into 'master'

Browse Source 
* Modify mr error.

See merge request easycorp/zentaopms!4936
This commit is contained in:
李玉春
2022-08-11 08:00:47 +00:00
parent 02bab0a206 0e6bc3432e
commit cfa6b03e8e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+4 -4
View File
@@ -122,7 +122,7 @@ class mr extends control
$giteaUsers = $this->gitea->getGiteaListByAccount();
foreach($hosts as $hostID => $host)
{
if($host->type == 'gitLab' and isset($gitlabUsers[$hostID])) continue;
if($host->type == 'gitlab' and isset($gitlabUsers[$hostID])) continue;
if($host->type == 'gitea' and isset($giteaUsers[$hostID])) continue;
unset($hosts[$hostID]);
@@ -186,10 +186,10 @@ class mr extends control
if(!$this->app->user->admin and $scm == 'gitlab')
{
$groupIDList = array(0 => 0);
$groups = $this->scm->apiGetGroups($MR->hostID, 'name_asc', 'developer');
$groups = $this->$scm->apiGetGroups($MR->hostID, 'name_asc', 'developer');
foreach($groups as $group) $groupIDList[] = $group->id;
$sourceProject = $this->scm->apiGetSingleProject($MR->hostID, $MR->sourceProject);
$isDeveloper = $this->scm->checkUserAccess($MR->hostID, 0, $sourceProject, $groupIDList, 'developer');
$sourceProject = $this->$scm->apiGetSingleProject($MR->hostID, $MR->sourceProject);
$isDeveloper = $this->$scm->checkUserAccess($MR->hostID, 0, $sourceProject, $groupIDList, 'developer');
if(!isset($gitUsers[$this->app->user->account]) or !$isDeveloper) return print(js::alert($this->lang->mr->errorLang[3]) . js::locate($this->createLink('mr', 'browse')));
}