* Fix bugs.

This commit is contained in:
liuyongkai
2023-02-07 09:18:27 +08:00
parent ac066acdc9
commit 101456df7c
3 changed files with 24 additions and 4 deletions
+1 -1
View File
@@ -641,7 +641,7 @@ class repo extends control
$this->view->path = urldecode($path);
$this->view->logType = $logType;
$this->view->cloneUrl = $this->repo->getCloneUrl($repo);
$this->view->cacheTime = date('m-d H:i', strtotime($lastRevision->time));
$this->view->cacheTime = isset($lastRevision->time) ? date('m-d H:i', strtotime($lastRevision->time)) : date('m-d H:i');
$this->view->branchOrTag = $branchOrTag;
$this->view->syncedRF = strpos(",{$this->config->repo->synced},", ",$repoID,") !== false; //Check has synced rename files.
+22 -2
View File
@@ -2281,7 +2281,7 @@ class repoModel extends model
->where('t1.repo')->eq($repo->id)
->andWhere('left(t2.comment, 12)')->ne('Merge branch')
->beginIF($repo->SCM != 'Subversion' and $branch)->andWhere('t3.branch')->eq($branch)->fi()
->andWhere('t1.parent')->like("$parent%")->fi()
->andWhere('t1.parent')->eq("$parent")
->orderBy('t2.`time` asc')
->fetchAll('path');
@@ -2360,9 +2360,29 @@ class repoModel extends model
->orderBy('t2.`time` asc')
->fetchPairs();
$removedDirs = array();
if($repo->SCM == 'Subversion')
{
$removedDirs = $this->dao->select('id, path')->from(TABLE_REPOFILES)
->where('repo')->eq($repo->id)
->andWhere('type')->eq('dir')
->andWhere('action')->eq('D')
->fetchPairs();
}
foreach($files as $file => $action)
{
if($action != 'D') $allFiles[] = $file;
foreach($removedDirs as $dir)
{
if(strpos($file, $dir) === 0)
{
$action = 'D';
break;
}
}
if($action != 'D')
{
$allFiles[] = $file;
}
}
}
else
+1 -1
View File
@@ -21,7 +21,7 @@ class reportZen extends report
if(!$module || !$method) list($module, $method, $params) = $this->getDefaultMethod($dimension, $group);
if(!empty($module) && !empty($method) && !common::hasPriv($module, $method)) common::deny('report', $method);
$this->view->sidebar = $this->getSidebar($dimension, $group, $module, $method, $params);
$this->view->dimension = $dimension;
$this->view->group = $group;