From 8ebe5b4cc9dc7c666a4ced2e719c7b8c5fa60321 Mon Sep 17 00:00:00 2001
From: lichengjun <lichengjun@easycorp.ltd>
Date: Tue, 17 Aug 2021 11:14:56 +0000
Subject: [PATCH] * adjust the GitLab list function

---
 module/gitlab/model.php | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index e80bbf41e2..aa350199fb 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -34,12 +34,40 @@ class gitlabModel extends model
      */
     public function getList($orderBy = 'id_desc', $pager = null)
     {
-        return $this->loadModel('pipeline')->getList('gitlab', $orderBy, $pager);
+        $pipeline = $this->loadModel('pipeline')->getList('gitlab', $orderBy, $pager);
+
+        $lists = array();
+        foreach ($pipeline as $pipelineGitlab)
+        {
+            $token  = $this->apiGetCurrentUser($pipelineGitlab->url,$pipelineGitlab->token);
+
+            $list = new stdclass;
+
+            $list->id          = $pipelineGitlab->id;
+            $list->type        = $pipelineGitlab->type;
+            $list->name        = $pipelineGitlab->name;
+            $list->url         = $pipelineGitlab->url;
+            $list->account     = $pipelineGitlab->account;
+            $list->password    = $pipelineGitlab->password;
+            $list->token       = $pipelineGitlab->token;
+            $list->private     = $pipelineGitlab->private;
+            $list->createdBy   = $pipelineGitlab->createdBy;
+            $list->createdDate = $pipelineGitlab->createdDate;
+            $list->editedBy    = $pipelineGitlab->editedBy;
+            $list->editedDate  = $pipelineGitlab->editedDate;
+            $list->deleted     = $pipelineGitlab->deleted;
+            $list->is_admin    = $token->is_admin;
+
+            $lists[] = $list;
+        }
+
+        return $lists;
     }
 
     /**
      * Get gitlab pairs.
      *
+
      * @access public
      * @return array
      */