Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR

module/gitlab/control.php

@@ -101,6 +101,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;
@@ -140,7 +144,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;

module/gitlab/lang/zh-cn.php

@@ -40,6 +40,7 @@ $lang->gitlab->placeholder->token = "请填写具有admin权限账户的access t
 
 $lang->gitlab->noImportableIssues = "目前没有可供导入的issue。";
 $lang->gitlab->tokenError         = "当前token非管理员权限。";
+$lang->gitlab->tokenLimit         = "GitLab Token权限不足，无法使用当前功能。请更换为有管理员权限的GitLab Token。";
 $lang->gitlab->hostError          = "无效的GitLab服务地址。";
 $lang->gitlab->bindUserError      = "不能重复绑定用户 %s";
 $lang->gitlab->importIssueError   = "未选择该issue所属的执行。";