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

* [task#125050,doing,0.5h] adjust commits get filter for gitlab.

Browse Source
This commit is contained in:
caoyanyi
2024-08-12 14:38:42 +08:00
committed by 李阳
parent b17c411d1e
commit bc28a9cbca
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+13 -2
View File
@@ -267,14 +267,25 @@ class gitlabModel extends model
* @param object $pager
* @param string $begin
* @param string $end
* @param object $query
* @access public
* @return array
*/
public function getCommits(object $repo, string $entry, object $pager = null, string $begin = '', string $end = ''): array
public function getCommits(object $repo, string $entry, object $pager = null, string $begin = '', string $end = '', object|null $query = null): array
{
$scm = $this->app->loadClass('scm');
$scm->setEngine($repo);
$comments = $scm->engine->getCommitsByPath($entry, '', '', isset($pager->recPerPage) ? $pager->recPerPage : 10, isset($pager->pageID) ? $pager->pageID : 1, false, $begin, $end);
$fromRevision = $toRevision = $committer = '';
if($query)
{
$fromRevision = zget($query, 'commit', '');
$toRevision = $fromRevision;
$committer = zget($query, 'committer', '');
if($query->begin) $begin = $query->begin;
if($query->end) $end = $query->end;
}
$comments = $scm->engine->getCommitsByPath($entry, $fromRevision, $toRevision, isset($pager->recPerPage) ? $pager->recPerPage : 10, isset($pager->pageID) ? $pager->pageID : 1, $begin, $end, $committer);
if(!is_array($comments)) return array();
if(isset($pager->recTotal)) $pager->recTotal = count($comments) < $pager->recPerPage ? $pager->recPerPage * $pager->pageID : $pager->recPerPage * ($pager->pageID + 1);