From 41fdea88fd6391656c0c3d52e6702b19bfb798bc Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 28 Dec 2023 11:02:28 +0800 Subject: [PATCH] * Adjust git repo refresh error. --- module/git/model.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/module/git/model.php b/module/git/model.php index 5d5fca75e1..5026bc5968 100644 --- a/module/git/model.php +++ b/module/git/model.php @@ -193,17 +193,14 @@ class gitModel extends model $branches = $this->loadModel('repo')->getBranches($repo); $commits = $repo->commits; - $scm = strtolower($repo->SCM); - $acountIDPairs = $this->loadModel('pipeline')->getUserBindedPairs($repo->serviceHost, $scm, 'openID,account'); - $accountPairs = array(); - if($scm != 'git') + if($repo->SCM != 'Git') { - $userList = $this->loadModel($scm)->apiGetUsers($repo->serviceHost); - if(!empty($userList)) - { - foreach($userList as $user) $accountPairs[$user->realname] = zget($acountIDPairs, $user->id, ''); - } + $scm = strtolower($repo->SCM); + $userList = $this->loadModel($scm)->apiGetUsers($repo->serviceHost); + $acountIDPairs = $this->loadModel('pipeline')->getUserBindedPairs($repo->serviceHost, $scm, 'openID,account'); + + foreach($userList as $user) $accountPairs[$user->realname] = zget($acountIDPairs, $user->id, ''); } /* Update code commit history. */