Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 23:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 云端同步冲突时支持设置是否产生冲突文档 https://github.com/siyuan-note/siyuan/issues/6110

Browse source
This commit is contained in:
Liang Ding 2022-10-09 10:36:41 +08:00
parent 6e7e154a3c
commit 698f773ee2
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
9 changed files with 43 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
kernel/api/sync.go
View file

@ -108,6 +108,19 @@ func createCloudSyncDir(c *gin.Context) {
}
}
func setSyncGenerateConflictDoc(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
arg, ok := util.JsonArg(c, ret)
if !ok {
return
}
enabled := arg["enabled"].(bool)
model.SetSyncGenerateConflictDoc(enabled)
}
func setSyncEnable(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)