diff --git a/module/gitlab/control.php b/module/gitlab/control.php index 25130cfde3..dcf9627853 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -550,10 +550,19 @@ class gitlab extends control */ public function browseUser($gitlabID, $orderBy = 'id_desc') { + $isAdmin = true; + if(!$this->app->user->admin) + { + $userID = $this->gitlab->getUserIDByZentaoAccount($gitlabID, $this->app->user->account); + $user = $this->gitlab->apiGetSingleUser($gitlabID, $userID); + if(!$user->is_admin) $isAdmin = false; + } + $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->orderBy = $orderBy; + $this->view->isAdmin = $isAdmin; $this->display(); } diff --git a/module/gitlab/view/browseuser.html.php b/module/gitlab/view/browseuser.html.php index d1c9e3e0d5..22d00db2cb 100644 --- a/module/gitlab/view/browseuser.html.php +++ b/module/gitlab/view/browseuser.html.php @@ -55,7 +55,7 @@ id", " ", '', "title='{$lang->gitlab->user->edit}' class='btn btn-primary'"); - if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'deleteUser', "gitlabID=$gitlabID&userID=$gitlabUser->id"), '', 'hiddenwin', "title='{$lang->gitlab->deleteUser}' class='btn'"); + if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'deleteUser', "gitlabID=$gitlabID&userID=$gitlabUser->id"), '', 'hiddenwin', "title='{$lang->gitlab->deleteUser}' class='btn'" . ($isAdmin ? '' : ' disabled')); ?>