From ae65b71c3b712a914dc153aee22a7819542d3d07 Mon Sep 17 00:00:00 2001
From: zhaoke <zhaoke@easycorp.ltd>
Date: Wed, 6 Sep 2023 14:14:12 +0800
Subject: [PATCH] * Fix bug #38253.

---
 module/instance/zen.php             | 2 +-
 module/repo/control.php             | 3 ++-
 module/repo/js/showsynccommit.ui.js | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/instance/zen.php b/module/instance/zen.php
index be7716a277..2b403aefcf 100644
--- a/module/instance/zen.php
+++ b/module/instance/zen.php
@@ -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;
 
diff --git a/module/repo/control.php b/module/repo/control.php
index 29c9864979..5be6a84ee3 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -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];
diff --git a/module/repo/js/showsynccommit.ui.js b/module/repo/js/showsynccommit.ui.js
index 1e031d33be..d204dcbd5a 100644
--- a/module/repo/js/showsynccommit.ui.js
+++ b/module/repo/js/showsynccommit.ui.js
@@ -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;