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

🎨 Shallow clone the corresponding database when the template contains database blocks https://github.com/siyuan-note/siyuan/issues/9494

Browse source
This commit is contained in:
Daniel 2023-10-24 09:38:33 +08:00
parent 7145460c18
commit 8ad15c4d23
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kernel/api/template.go
View file

@ -80,7 +80,12 @@ func renderTemplate(c *gin.Context) {
return return
} }
content, err := model.RenderTemplate(p, id) preview := false
if previewArg := arg["preview"]; nil != previewArg {
preview = previewArg.(bool)
}
content, err := model.RenderTemplate(p, id, preview)
if nil != err { if nil != err {
ret.Code = -1 ret.Code = -1
ret.Msg = util.EscapeHTML(err.Error()) ret.Msg = util.EscapeHTML(err.Error())

2
kernel/model/file.go
View file

@ -1448,7 +1448,7 @@ func CreateDailyNote(boxID string) (p string, existed bool, err error) {
if !gulu.File.IsExist(tplPath) { if !gulu.File.IsExist(tplPath) {
logging.LogWarnf("not found daily note template [%s]", tplPath) logging.LogWarnf("not found daily note template [%s]", tplPath)
} else { } else {
dom, err = renderTemplate(tplPath, id) dom, err = renderTemplate(tplPath, id, false)
if nil != err { if nil != err {
logging.LogWarnf("render daily note template [%s] failed: %s", boxConf.DailyNoteTemplatePath, err) logging.LogWarnf("render daily note template [%s] failed: %s", boxConf.DailyNoteTemplatePath, err)
} }

12
kernel/model/template.go
View file

@ -164,11 +164,11 @@ func DocSaveAsTemplate(id, name string, overwrite bool) (code int, err error) {
return return
} }
func RenderTemplate(p, id string) (string, error) { func RenderTemplate(p, id string, preview bool) (string, error) {
return renderTemplate(p, id) return renderTemplate(p, id, preview)
} }
func renderTemplate(p, id string) (string, error) { func renderTemplate(p, id string, preview bool) (string, error) {
tree, err := loadTreeByBlockID(id) tree, err := loadTreeByBlockID(id)
if nil != err { if nil != err {
return "", err return "", err
@ -288,8 +288,10 @@ func renderTemplate(p, id string) (string, error) {
cloned := av.CloneAttributeView(attrView) cloned := av.CloneAttributeView(attrView)
if nil != cloned { if nil != cloned {
n.AttributeViewID = cloned.ID n.AttributeViewID = cloned.ID
if saveErr := av.SaveAttributeView(cloned); nil != saveErr { if !preview {
logging.LogErrorf("save attribute view [%s] failed: %s", cloned.ID, saveErr) if saveErr := av.SaveAttributeView(cloned); nil != saveErr {
logging.LogErrorf("save attribute view [%s] failed: %s", cloned.ID, saveErr)
}
} }
} }
} }