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

* Finish task #59441,59442,59443,59444,59445.

Browse Source
This commit is contained in:
caoyanyi
2022-07-04 14:53:16 +08:00
parent 01f6be9b57
commit 018ba38397
16 changed files with 372 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/control.php
+16 -3
View File
@@ -325,8 +325,9 @@ class gitlab extends control
if(!$openID) return print(js::alert($this->lang->gitlab->mustBindUser) . js::locate($this->createLink('gitlab', 'browse')));
}
$groups = $this->gitlab->apiGetGroups($gitlabID, $orderBy);
$adminGroups = $this->gitlab->apiGetGroups($gitlabID, $orderBy, 'owner');
$keyword = fixer::input('post')->setDefault('keyword', '')->get('keyword');
$groups = $this->gitlab->apiGetGroups($gitlabID, $orderBy, '', $keyword);
$adminGroups = $this->gitlab->apiGetGroups($gitlabID, $orderBy, 'owner', $keyword);
$adminGroupIDList = array();
foreach($adminGroups as $group) $adminGroupIDList[] = $group->id;
@@ -337,6 +338,7 @@ class gitlab extends control
$this->view->gitlabGroupList = $groups;
$this->view->adminGroupIDList = $adminGroupIDList;
$this->view->orderBy = $orderBy;
$this->view->keyword = $keyword;
$this->display();
}
@@ -558,11 +560,22 @@ class gitlab extends control
if(!$user->is_admin) $isAdmin = false;
}
$keyword = fixer::input('post')->setDefault('keyword', '')->get('keyword');
$users = $this->gitlab->apiGetUsers($gitlabID, false, $orderBy);
if($keyword)
{
foreach($users as $key => $user)
{
if(strpos($user->realname, $keyword) === false) unset($users[$key]);
}
}
$this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browseUser;
$this->view->gitlabID = $gitlabID;
$this->view->gitlabUserList = $this->gitlab->apiGetUsers($gitlabID, false, $orderBy);
$this->view->gitlabUserList = $users;
$this->view->orderBy = $orderBy;
$this->view->isAdmin = $isAdmin;
$this->view->keyword = $keyword;
$this->display();
}