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

🎨 Prompt when database template field reports an error https://github.com/siyuan-note/siyuan/issues/11070

Browse source
This commit is contained in:
Daniel 2024-04-18 11:29:09 +08:00
parent e4a128123d
commit f802fb4e1b
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
kernel/model/attribute_view.go
View file

@ -64,10 +64,7 @@ func GetAttributeViewPrimaryKeyValues(avID, keyword string, page, pageSize int)
logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
return
}
attributeViewName = attrView.Name
if "" == attributeViewName {
attributeViewName = Conf.language(105)
}
attributeViewName = getAttrViewName(attrView)
databaseBlockIDs = treenode.GetMirrorAttrViewBlockIDs(avID)
@ -514,7 +511,7 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
var renderErr error
kv.Values[0].Template.Content, renderErr = renderTemplateCol(ial, flashcard, keyValues, kv.Key.Template)
if nil != renderErr {
renderTemplateErr = renderErr
renderTemplateErr = fmt.Errorf("database [%s] template field [%s] rendering failed: %s", getAttrViewName(attrView), kv.Key.Name, renderErr)
}
}
}
@ -1244,7 +1241,12 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
content, renderErr := renderTemplateCol(ial, flashcards[row.ID], keyValues, cell.Value.Template.Content)
cell.Value.Template.Content = content
if nil != renderErr {
renderTemplateErr = renderErr
key, _ := attrView.GetKey(cell.Value.KeyID)
keyName := ""
if nil != key {
keyName = key.Name
}
renderTemplateErr = fmt.Errorf("database [%s] template field [%s] rendering failed: %s", getAttrViewName(attrView), keyName, renderErr)
}
}
}
@ -3520,3 +3522,11 @@ func getAttrViewViewByBlockID(attrView *av.AttributeView, blockID string) (ret *
}
return attrView.GetCurrentView(viewID)
}
func getAttrViewName(attrView *av.AttributeView) string {
ret := attrView.Name
if "" == ret {
ret = Conf.language(105)
}
return ret
}