This commit is contained in:
caoyanyi
2022-12-26 10:58:56 +08:00
parent ba606b1dab
commit 42aea64d75
2 changed files with 12 additions and 3 deletions
+10 -1
View File
@@ -156,7 +156,16 @@ js::set('browser', $browser);
<?php endif;?>
</div>
<?php else:?>
<?php include '../../repo/view/diffeditor.html.php';?>
<?php
if(empty($diffs))
{
echo "<p class='detail-content'>{$lang->mr->noChanges}</p>";
}
else
{
include '../../repo/view/diffeditor.html.php';
}
?>
<?php endif;?>
</div>
</div>
+2 -2
View File
@@ -2341,10 +2341,10 @@ class repoModel extends model
* @access public
* @return string
*/
public function getFileTree($repo, $branch = '', $diffs = array())
public function getFileTree($repo, $branch = '', $diffs = null)
{
$allFiles = array();
if(empty($diffs))
if(is_null($diffs))
{
if($repo->SCM != 'Subversion' and empty($branch)) $branch = $this->cookie->repoBranch;
$files = $this->dao->select('t1.path,t1.action')->from(TABLE_REPOFILES)->alias('t1')