0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2022-07-05 23:58:52 +08:00
commit de1954869e
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/api/sync.go
View file

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

8
kernel/model/repository.go
View file

@ -212,7 +212,9 @@ func DownloadCloudSnapshot(tag, id string) (err error) {
return
}
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
}
@ -237,7 +239,9 @@ func UploadCloudSnapshot(tag, id string) (err error) {
return
}
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
}