Przeglądaj źródła

Merge remote-tracking branch 'origin/dev' into dev

Vanessa 3 lat temu
rodzic
commit
de1954869e
2 zmienionych plików z 7 dodań i 3 usunięć
  1. 1 1
      kernel/api/sync.go
  2. 6 2
      kernel/model/repository.go

+ 1 - 1
kernel/api/sync.go

@@ -42,7 +42,7 @@ func getBootSync(c *gin.Context) {
 	ret := gulu.Ret.NewResult()
 	ret := gulu.Ret.NewResult()
 	defer c.JSON(http.StatusOK, ret)
 	defer c.JSON(http.StatusOK, ret)
 
 
-	if 1 == model.BootSyncSucc {
+	if model.Conf.Sync.Enabled && 1 == model.BootSyncSucc {
 		ret.Code = 1
 		ret.Code = 1
 		ret.Msg = model.Conf.Language(17)
 		ret.Msg = model.Conf.Language(17)
 		return
 		return

+ 6 - 2
kernel/model/repository.go

@@ -212,7 +212,9 @@ func DownloadCloudSnapshot(tag, id string) (err error) {
 		return
 		return
 	}
 	}
 	util.PushClearProgress()
 	util.PushClearProgress()
-	util.PushMsg(fmt.Sprintf(Conf.Language(153), downloadFileCount, downloadChunkCount, byteCountSI(downloadBytes)), 5000)
+	msg := fmt.Sprintf(Conf.Language(153), downloadFileCount, downloadChunkCount, byteCountSI(downloadBytes))
+	util.PushMsg(msg, 5000)
+	util.PushStatusBar(msg)
 	return
 	return
 }
 }
 
 
@@ -237,7 +239,9 @@ func UploadCloudSnapshot(tag, id string) (err error) {
 		return
 		return
 	}
 	}
 	util.PushClearProgress()
 	util.PushClearProgress()
-	util.PushMsg(fmt.Sprintf(Conf.Language(152), uploadFileCount, uploadChunkCount, byteCountSI(uploadBytes)), 5000)
+	msg := fmt.Sprintf(Conf.Language(152), uploadFileCount, uploadChunkCount, byteCountSI(uploadBytes))
+	util.PushMsg(msg, 5000)
+	util.PushStatusBar(msg)
 	return
 	return
 }
 }