From bf103ceb7890a72edc6e0b83a7350284c3be13d2 Mon Sep 17 00:00:00 2001 From: Guan Xiying Date: Wed, 25 Aug 2021 10:39:29 +0800 Subject: [PATCH] * Merge task #41371. --- module/gitlab/control.php | 15 +++++++++++++-- module/gitlab/view/browse.html.php | 7 ++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/module/gitlab/control.php b/module/gitlab/control.php index 22d0ed511f..082b881d9e 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -29,8 +29,16 @@ class gitlab extends control $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); + $gitlabList = $this->gitlab->getList($orderBy, $pager); + foreach($gitlabList as $gitlab) + { + $token = $this->gitlab->apiGetCurrentUser($gitlab->url,$gitlab->token); + $gitlab->isAdminToken = isset($token->is_admin) ? $token->is_admin : 0; + } + + $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browse; - $this->view->gitlabList = $this->gitlab->getList($orderBy, $pager); + $this->view->gitlabList = $gitlabList; $this->view->orderBy = $orderBy; $this->view->pager = $pager; @@ -94,6 +102,10 @@ class gitlab extends control { $userPairs = $this->loadModel('user')->getPairs(); + $gitlab = $this->gitlab->getByID($gitlabID); + $user = $this->gitlab->apiGetCurrentUser($gitlab->url, $gitlab->token); + if(!isset($user->is_admin) or !$user->is_admin) die(js::alert($this->lang->gitlab->tokenLimit) . js::locate($this->createLink('gitlab', 'edit', array('gitlabID' => $gitlabID)))); + if($_POST) { $users = $this->post->zentaoUsers; @@ -133,7 +145,6 @@ class gitlab extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->server->http_referer)); } - $gitlab = $this->gitlab->getByID($gitlabID); $zentaoUsers = $this->dao->select('account,email,realname')->from(TABLE_USER)->fetchAll('account'); $this->view->title = $this->lang->gitlab->bindUser; diff --git a/module/gitlab/view/browse.html.php b/module/gitlab/view/browse.html.php index 3ddbdcdf5a..d4e475952a 100644 --- a/module/gitlab/view/browse.html.php +++ b/module/gitlab/view/browse.html.php @@ -40,14 +40,15 @@ $gitlab): ?> - + name;?> url;?> isAdminToken) ? '' : 'disabled'; + common::printLink('gitlab', 'edit', "gitlabID=$id", " ", '',"title={$lang->gitlab->edit} class='btn btn-primary'"); + common::printLink('gitlab', 'bindUser', "id=$id", " ", '', "title={$lang->gitlab->bindUser} class='btn btn-primary {$disabled}' ,'disabled'"); if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'delete', "gitlabID=$id"), '', 'hiddenwin', "title='{$lang->gitlab->delete}' class='btn'"); ?>