Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Adjust git repo refresh error.

Browse Source
This commit is contained in:
caoyanyi
2023-12-28 11:02:28 +08:00
parent 792c932c92
commit 41fdea88fd
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/git/model.php
+6 -9
View File
@@ -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. */