github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-07 20:30:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

hugolib: Fix dates for sections with dates in front matter

Browse source 
Fixes #5854
This commit is contained in:
Bjørn Erik Pedersen 2019-04-13 18:58:06 +02:00
parent f2795d4d2c
commit 701486728e
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hugolib/page_test.go
View file

@ -505,6 +505,14 @@ date: 2017-01-15
title: No Date
---
`)
// https://github.com/gohugoio/hugo/issues/5854
b.WithSimpleConfigFile().WithContent("with-index-date/_index.md", `---
title: Date
date: 2018-01-15
---
`)
b.CreateSites().Build(BuildCfg{})
@ -515,6 +523,7 @@ title: No Date
assert.Equal(2017, s.getPage("/").Date().Year())
assert.Equal(2017, s.getPage("/no-index").Date().Year())
assert.True(s.getPage("/with-index-no-date").Date().IsZero())
assert.Equal(2018, s.getPage("/with-index-date").Date().Year())
}

19
hugolib/site_sections.go
View file

@ -162,12 +162,18 @@ func (s *Site) assembleSections() pageStatePages {
if currentSection != nil {
// A new section
currentSection.setPages(children)
currentSection.m.Dates = *dates
if dates != nil {
currentSection.m.Dates = *dates
}
}
currentSection = p
children = make(page.Pages, 0)
dates = &resource.Dates{}
dates = nil
// Use section's dates from front matter if set.
if resource.IsZeroDates(currentSection) {
dates = &resource.Dates{}
}
return false
@ -176,15 +182,18 @@ func (s *Site) assembleSections() pageStatePages {
// Regular page
p.parent = currentSection
children = append(children, p)
dates.UpdateDateAndLastmodIfAfter(p)
if dates != nil {
dates.UpdateDateAndLastmodIfAfter(p)
}
return false
})
if currentSection != nil {
currentSection.setPages(children)
currentSection.m.Dates = *dates
if dates != nil {
currentSection.m.Dates = *dates
}
}
// Build the sections hierarchy