Merge branch 'fixbug' into 'master'

* Fix feedback #1530.

See merge request easycorp/zentaopms!6349

module/gitlab/control.php

@@ -43,13 +43,6 @@ class gitlab extends control
 
         /* Admin user don't need bind. */
         $gitlabList = $this->gitlab->getList($orderBy, $pager);
-        $myGitLabs  = $this->gitlab->getGitLabListByAccount();
-
-        foreach($gitlabList as $gitlab)
-        {
-            $gitlab->isBindUser = true;
-            if(!$this->app->user->admin and !isset($myGitLabs[$gitlab->id])) $gitlab->isBindUser = false;
-        }
 
         $this->view->title      = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browse;
         $this->view->gitlabList = $gitlabList;

module/gitlab/view/browse.html.php

@@ -55,9 +55,8 @@
           <td class='text' title='<?php echo $gitlab->url;?>'><?php echo html::a($gitlab->url, $gitlab->url, '_target');?></td>
           <td class='c-actions'>
             <?php
-            $disabled = $gitlab->isBindUser ? true : false;
             common::printIcon('gitlab', 'edit', "gitlabID=$id", '', 'list', 'edit');
-            echo common::buildIconButton('gitlab', 'bindUser', "gitlabID=$id", '', 'list', 'link', '', '', false, '', '', 0, $disabled);
+            echo common::buildIconButton('gitlab', 'bindUser', "gitlabID=$id", '', 'list', 'link');
             common::printIcon('gitlab', 'delete', "gitlabID=$id", '', 'list', 'trash', 'hiddenwin');
             ?>
           </td>