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

* finish task #7426.

Browse Source
This commit is contained in:
z
2020-07-23 11:04:02 +08:00
parent 227ccdd17d
commit 13a7e4802b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/repo/control.php
+10 -1
View File
@@ -407,7 +407,16 @@ class repo extends control
$history = $this->dao->select('*')->from(TABLE_REPOHISTORY)->where('revision')->eq($log[0]->revision)->andWhere('repo')->eq($repoID)->fetch();
if($history)
{
$oldRevision = $this->dao->select('revision')->from(TABLE_REPOHISTORY)->where('commit')->eq($history->commit - 1)->andWhere('repo')->eq($repoID)->fetch('revision');
$prevHistories = $this->dao->select('*')->from(TABLE_REPOHISTORY)->where('commit')->eq($history->commit - 1)->andWhere('repo')->eq($repoID)->orderBy('time_desc')->fetchAll();
foreach($prevHistories as $prevHistory)
{
if($history->time > $prevHistory->time)
{
$oldRevision = $prevHistory->revision;
break;
}
}
$log[0]->commit = $history->commit;
}
if(empty($oldRevision)) $oldRevision = '^';