diff --git a/module/gitlab/control.php b/module/gitlab/control.php index 99f19d7d54..4f9408b36a 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -33,7 +33,7 @@ class gitlab extends control foreach($gitlabList as $gitlab) { $token = $this->gitlab->apiGetCurrentUser($gitlab->url,$gitlab->token); - $gitlab->isAdminToken = !isset($token->is_admin) ? $token->is_admin : 0; + $gitlab->isAdminToken = isset($token->is_admin) ? $token->is_admin : 0; } $this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browse; diff --git a/module/gitlab/view/browse.html.php b/module/gitlab/view/browse.html.php index 582e10fabd..586860b235 100644 --- a/module/gitlab/view/browse.html.php +++ b/module/gitlab/view/browse.html.php @@ -46,10 +46,11 @@ url;?> isAdminToken) ? '' : 'disabled'; - common::printLink('gitlab', 'edit', "gitlabID=$id", " ", '',"title={$lang->gitlab->edit} class='btn btn-primary {$disabled}', 'disabled'"); - common::printLink('gitlab', 'bindUser', "id=$id", " ", '', "title={$lang->gitlab->bindUser} class='btn btn-primary {$disabled}'"); - if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'delete', "gitlabID=$id"), '', 'hiddenwin', "title='{$lang->gitlab->delete}' class='btn {$disabled}'"); + $disabled = !empty($gitlab->isAdminToken) ? '' : 'disabled'; + $bindUserLang = !empty($gitlab->isAdminToken) ? $lang->gitlab->bindUser : $lang->gitlab->tokenError; + common::printLink('gitlab', 'edit', "gitlabID=$id", " ", '',"title={$lang->gitlab->edit} class='btn btn-primary'"); + common::printLink('gitlab', 'bindUser', "id=$id", " ", '', "title={$bindUserLang} 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'"); ?>