Merge branch 'sprint/devops_liyuchun_bug' into 'master'

Sprint/devops liyuchun bug See merge request easycorp/zentaopms!738
2021-12-02 06:16:37 +00:00
parent 54c761da36 696892f246
commit 1c86d07967
10 changed files with 40 additions and 26 deletions
@@ -967,6 +967,7 @@ class gitlab extends control
        $repo           = $this->loadModel('repo')->getRepoByID($repoID);
        $users          = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted|noclosed');
        $projectMembers = $this->gitlab->apiGetProjectMembers($repo->gitlab, $repo->project);
+        if(!is_array($projectMembers)) $projectMembers = array();

        /* Get users accesslevel. */
        $userAccessData = array();
@@ -975,6 +976,7 @@ class gitlab extends control
            ->where('providerType')->eq('gitlab')
            ->andWhere('providerID')->eq($repo->gitlab)
            ->fetchPairs();
+
        foreach($projectMembers as $projectMember)
        {
            if(isset($projectMember->id) and isset($bindedUsers[$projectMember->id]))