hugolib: Fix cascade in server mode

Fixes #6538
This commit is contained in:
Bjørn Erik Pedersen 2019-11-26 14:20:31 +01:00
parent da53523599
commit 0176643924
2 changed files with 57 additions and 1 deletions

View file

@ -100,6 +100,50 @@ func TestCascade(t *testing.T) {
}
func TestCascadeEdit(t *testing.T) {
p1Content := `---
title: P1
---
`
b := newTestSitesBuilder(t).Running()
b.WithTemplatesAdded("_default/single.html", `Banner: {{ .Params.banner }}|Layout: {{ .Layout }}|Type: {{ .Type }}|Content: {{ .Content }}`)
b.WithContent("post/_index.md", `
---
title: Post
cascade:
banner: post.jpg
layout: postlayout
type: posttype
---
`)
b.WithContent("post/dir/_index.md", `
---
title: Dir
---
`, "post/dir/p1.md", p1Content)
b.Build(BuildCfg{})
assert := func() {
b.Helper()
b.AssertFileContent("public/post/dir/p1/index.html",
`Banner: post.jpg|`,
`Layout: postlayout`,
`Type: posttype`,
)
}
assert()
b.EditFiles("content/post/dir/p1.md", p1Content+"\ncontent edit")
b.Build(BuildCfg{})
assert()
b.AssertFileContent("public/post/dir/p1/index.html",
`content edit`,
)
}
func newCascadeTestBuilder(t testing.TB, langs []string) *sitesBuilder {
p := func(m map[string]interface{}) string {
var yamlStr string

View file

@ -148,7 +148,19 @@ func (m *pagesMap) addBucketFor(key string, p *pageState, meta map[string]interf
disabled := !m.s.isEnabled(p.Kind())
bucket := &pagesMapBucket{owner: p, view: isView, meta: meta, disabled: disabled}
var cascade map[string]interface{}
if p.bucket != nil {
cascade = p.bucket.cascade
}
bucket := &pagesMapBucket{
owner: p,
view: isView,
cascade: cascade,
meta: meta,
disabled: disabled,
}
p.bucket = bucket
m.r.Insert(key, bucket)