apairon/mark2web
1
1
Fork 0
Code Issues 8 Pull Requests Releases 5 Activity

fixed navname ignored in addSubNode
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Sebastian Frank 2019-06-12 12:59:41 +02:00
parent daed37587e
commit 93ea8b8b1b
Signed by: apairon
GPG Key ID: 7270D06DDA7FE8C3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/mark2web/context.go
View File

@ -112,11 +112,6 @@ func (node *TreeNode) addSubNode(tplFilename, subDir string, navname string, ctx
newNode.root = node.root newNode.root = node.root
newPathConfig := new(PathConfig) newPathConfig := new(PathConfig)
if navname != "" {
newPathConfig.This = ThisPathConfig{
Navname: &navname,
}
}
if dataMapKey != "" { if dataMapKey != "" {
if newPathConfig.Data == nil { if newPathConfig.Data == nil {
newPathConfig.Data = make(helper.MapString) newPathConfig.Data = make(helper.MapString)
@ -147,6 +142,10 @@ func (node *TreeNode) addSubNode(tplFilename, subDir string, navname string, ctx
subDir, subDir,
mergedConfig, mergedConfig,
) )
if navname != "" {
// set after fillConfig, because it is ignored in fillConfig
newNode.Config.This.Navname = &navname
}
// fake via normal file behavior // fake via normal file behavior
newNode.Config.Template = &tplFilename newNode.Config.Template = &tplFilename