Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGareth Watts <gareth@omnipotent.net>2020-10-22 20:14:14 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2020-10-23 00:00:19 +0300
commit3400aff2588cbf9dd4629c05537d16b019d0fdf5 (patch)
treee3714b454b2366f891cdfc746c5e9d9549d3a973 /hugolib
parentfdfa4a5fe62232f65f1dd8d6fe0c500374228788 (diff)
Allow cascade _target to work with non toml fm
The TOML lib unmarshals slices of string maps to []map[string]interface{} whereas YAML and JSON decode to []interface{} The existing tests only check for TOML working correctly, and _target with cascade did not work at all for frontmatter defined in other formats. Add a function to normalize those slices Fixes #7874
Diffstat (limited to 'hugolib')
-rw-r--r--hugolib/cascade_test.go54
-rw-r--r--hugolib/page__meta.go7
2 files changed, 57 insertions, 4 deletions
diff --git a/hugolib/cascade_test.go b/hugolib/cascade_test.go
index 336acdcf3..a112fe10c 100644
--- a/hugolib/cascade_test.go
+++ b/hugolib/cascade_test.go
@@ -459,4 +459,58 @@ S1|p1:|p2:p2|
})
+ c.Run("slice with yaml _target", func(c *qt.C) {
+ b := newBuilder(c)
+
+ b.WithContent("_index.md", `---
+title: "Home"
+cascade:
+- p1: p1
+ _target:
+ path: "**p1**"
+- p2: p2
+ _target:
+ kind: "section"
+---
+`)
+
+ b.Build(BuildCfg{})
+
+ b.AssertFileContent("public/index.html", `
+P1|p1:p1|p2:|
+S1|p1:|p2:p2|
+`)
+
+ })
+
+ c.Run("slice with json _target", func(c *qt.C) {
+ b := newBuilder(c)
+
+ b.WithContent("_index.md", `{
+"title": "Home",
+"cascade": [
+ {
+ "p1": "p1",
+ "_target": {
+ "path": "**p1**"
+ }
+ },{
+ "p2": "p2",
+ "_target": {
+ "kind": "section"
+ }
+ }
+]
+}
+`)
+
+ b.Build(BuildCfg{})
+
+ b.AssertFileContent("public/index.html", `
+ P1|p1:p1|p2:|
+ S1|p1:|p2:p2|
+ `)
+
+ })
+
}
diff --git a/hugolib/page__meta.go b/hugolib/page__meta.go
index 52ffbb880..d23718315 100644
--- a/hugolib/page__meta.go
+++ b/hugolib/page__meta.go
@@ -342,8 +342,7 @@ func (pm *pageMeta) setMetadata(parentBucket *pagesMapBucket, p *pageState, fron
if p.bucket != nil {
// Check for any cascade define on itself.
if cv, found := frontmatter["cascade"]; found {
- switch v := cv.(type) {
- case []map[string]interface{}:
+ if v, err := maps.ToSliceStringMap(cv); err == nil {
p.bucket.cascade = make(map[page.PageMatcher]maps.Params)
for _, vv := range v {
@@ -367,12 +366,12 @@ func (pm *pageMeta) setMetadata(parentBucket *pagesMapBucket, p *pageState, fron
}
}
- default:
+ } else {
p.bucket.cascade = map[page.PageMatcher]maps.Params{
page.PageMatcher{}: maps.ToStringMap(cv),
}
- }
+ }
}
}
} else {