diff --git a/module/repo/model.php b/module/repo/model.php index 5a536c25b3..983cd2b452 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -863,6 +863,8 @@ class repoModel extends model ->leftJoin(TABLE_REPOHISTORY)->alias('t2')->on('t1.revision=t2.id') ->beginIF($hasBranch)->leftJoin(TABLE_REPOBRANCH)->alias('t3')->on('t2.id=t3.revision')->fi() ->where('t1.repo')->eq($repo->id) + ->beginIF($begin)->andWhere('t2.`time`')->ge($begin)->fi() + ->beginIF($end)->andWhere('t2.`time`')->le($end)->fi() ->beginIF($revisionTime)->andWhere('t2.`time`')->le($revisionTime)->fi() ->andWhere('left(t2.`comment`, 12)')->ne('Merge branch') ->beginIF($hasBranch)->andWhere('t3.branch')->eq($this->cookie->repoBranch)->fi() @@ -882,6 +884,8 @@ class repoModel extends model ->where('t1.repo')->eq($repo->id) ->andWhere('left(t1.`comment`, 12)')->ne('Merge branch') ->beginIF($revisionTime)->andWhere('t1.`time`')->le($revisionTime)->fi() + ->beginIF($begin)->andWhere('t1.`time`')->ge($begin)->fi() + ->beginIF($end)->andWhere('t1.`time`')->le($end)->fi() ->beginIF($hasBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi() ->beginIF($entry != '/' && !empty($entry))->andWhere('t1.id')->in($historyIdList)->fi() ->beginIF($begin)->andWhere('t1.time')->ge($begin)->fi()