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

Merge branch 'liyuchun_bug_19323' into 'master'

Browse Source 
* Fix bug #19323.

See merge request easycorp/zentaopms!1800
This commit is contained in:
孙广明
2022-02-15 05:27:00 +00:00
parent d3f7997c56 7c3c7d1662
commit 9e171958bf
12 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+2 -2
View File
@@ -625,7 +625,7 @@ class gitlabModel extends model
$results = json_decode(commonModel::http($url . "&statistics=true&order_by={$order}&sort={$sort}&page={$page}&per_page=100&all_available=true"));
if(!is_array($results)) break;
if(!empty($results)) $allResults = array_merge($allResults, $results);
if(count($results) < 100 or $page > 10) break;
if(count($results) < 100) break;
}
return $allResults;
@@ -701,7 +701,7 @@ class gitlabModel extends model
$results = json_decode(commonModel::http($url . "&simple={$simple}&page={$page}&per_page=100"));
if(!is_array($results)) break;
if(!empty($results)) $allResults = array_merge($allResults, $results);
if(count($results) < 100 or $page > 10) break;
if(count($results) < 100) break;
}
return $allResults;