* Fix bug #38253.
This commit is contained in:
@@ -23,7 +23,7 @@ class instanceZen extends instance
|
||||
{
|
||||
if(empty($this->config->instance->devopsApps[$instance->appID])) return;
|
||||
|
||||
$url = 'https://' . $instance->domain;
|
||||
$url = strstr(getWebRoot(true), ':', true) . '://' . $instance->domain;
|
||||
$pipeline = $this->loadModel('pipeline')->getByUrl($url);
|
||||
if(!empty($pipeline)) return;
|
||||
|
||||
|
||||
@@ -1415,7 +1415,8 @@ class repo extends control
|
||||
$content = file($logFile);
|
||||
foreach($content as $line)
|
||||
{
|
||||
if($this->repo->strposAry($line, $this->config->repo->repoSyncLog->fatal) !== false or $this->repo->strposAry($line, $this->config->repo->repoSyncLog->failed) !== false) return print($this->config->repo->repoSyncLog->error);
|
||||
if($this->repo->strposAry($line, $this->config->repo->repoSyncLog->fatal) !== false) return print($line);
|
||||
if($this->repo->strposAry($line, $this->config->repo->repoSyncLog->failed) !== false) return print($line);
|
||||
}
|
||||
|
||||
$lastLine = $content[count($content) - 1];
|
||||
|
||||
@@ -3,6 +3,7 @@ function syncComments()
|
||||
$.get(link, function(data)
|
||||
{
|
||||
if(data == 'finish') return loadPage(browseLink);
|
||||
if(isNaN(Number(data))) return zui.Modal.alert(data);
|
||||
|
||||
var count = parseInt(data);
|
||||
if(isNaN(count)) count = 0;
|
||||
|
||||
Reference in New Issue
Block a user