* Adjust Gitlab list function.

This commit is contained in:
lichengjun
2021-08-18 08:49:02 +00:00
parent 6648beb067
commit 34391dbe4c
4 changed files with 22 additions and 33 deletions
+2 -27
View File
@@ -34,34 +34,9 @@ class gitlabModel extends model
*/
public function getList($orderBy = 'id_desc', $pager = null)
{
$pipeline = $this->loadModel('pipeline')->getList('gitlab', $orderBy, $pager);
$gitlabList = $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;
return $gitlabList;
}
/**