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

+ Add time fliter for commit search.

Browse Source
This commit is contained in:
caoyanyi
2024-04-25 17:04:37 +08:00
parent 5c87eac7a8
commit 2a9a06b4bb
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/repo/model.php
+4
View File
@@ -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()