From 9fee3403febd1f9e6e456872efd99ef7fb3d4cf1 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Mon, 29 Nov 2021 07:08:48 +0000
Subject: [PATCH] * Fix bug#16890,16888

---
 module/gitlab/control.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index 911544d543..4046e78443 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -606,7 +606,6 @@ class gitlab extends control
      */
     public function browseProject($gitlabID, $keyword = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
     {
-
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
@@ -869,6 +868,12 @@ class gitlab extends control
                 ->andWhere('providerID')->eq($repo->gitlab)
                 ->fetchPairs();
 
+            if(empty($repo->acl))
+            {
+                $repo->acl = new stdClass();
+                $repo->acl->users = array();
+            }
+
             $newGitlabMembers = array();
             foreach($accounts as $key => $account)
             {
@@ -958,7 +963,7 @@ class gitlab extends control
         }
 
         $repo           = $this->loadModel('repo')->getRepoByID($repoID);
-        $users          = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted');
+        $users          = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted|noclosed');
         $projectMembers = $this->gitlab->apiGetProjectMembers($repo->gitlab, $repo->project);
 
         /* Get users accesslevel. */