phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-04 16:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

hugolib: Fix Pages reinitialization on rebuilds

Browse source 
Which had some unpredictable behaviour when using `.Pages` on home page etc. that had a content page.

Fixes #5833
This commit is contained in:
Bjørn Erik Pedersen 2019-04-17 10:36:36 +02:00
parent 2957795f52
commit 9b17cbb62a
4 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
hugolib/hugo_sites_rebuild_test.go
View file

@ -52,13 +52,16 @@ Content.
b.WithTemplatesAdded("index.html", ` b.WithTemplatesAdded("index.html", `
{{ range (.Paginate .Site.RegularPages).Pages }} {{ range (.Paginate .Site.RegularPages).Pages }}
* Page: {{ .Title }}|Summary: {{ .Summary }}|Content: {{ .Content }} * Page Paginate: {{ .Title }}|Summary: {{ .Summary }}|Content: {{ .Content }}
{{ end }}
{{ range .Pages }}
* Page Pages: {{ .Title }}|Summary: {{ .Summary }}|Content: {{ .Content }}
{{ end }} {{ end }}
`) `)
b.Running().Build(BuildCfg{}) b.Running().Build(BuildCfg{})
b.AssertFileContent("public/index.html", "* Page: Page 1|Summary: Initial summary|Content: <p>Content.</p>") b.AssertFileContent("public/index.html", "* Page Paginate: Page 1|Summary: Initial summary|Content: <p>Content.</p>")
b.EditFiles(contentFilename, ` b.EditFiles(contentFilename, `
--- ---
@ -72,6 +75,9 @@ Edited content.
b.Build(BuildCfg{}) b.Build(BuildCfg{})
b.AssertFileContent("public/index.html", "* Page: Page 1 edit|Summary: Edited summary|Content: <p>Edited content.</p>") b.AssertFileContent("public/index.html", "* Page Paginate: Page 1 edit|Summary: Edited summary|Content: <p>Edited content.</p>")
// https://github.com/gohugoio/hugo/issues/5833
b.AssertFileContent("public/index.html", "* Page Pages: Page 1 edit|Summary: Edited summary|Content: <p>Edited content.</p>")
} }

8
hugolib/page__common.go
View file

@ -87,8 +87,7 @@ type pageCommon struct {
page.InternalDependencies page.InternalDependencies
// The children. Regular pages will have none. // The children. Regular pages will have none.
pages page.Pages *pagePages
pagesInit sync.Once
// Any bundled resources // Any bundled resources
resources resource.Resources resources resource.Resources
@ -111,3 +110,8 @@ type pageCommon struct {
// Set in fast render mode to force render a given page. // Set in fast render mode to force render a given page.
forceRender bool forceRender bool
} }
type pagePages struct {
pages page.Pages
pagesInit sync.Once
}

1
hugolib/page__new.go
View file

@ -57,6 +57,7 @@ func newPageBase(metaProvider *pageMeta) (*pageState, error) {
RefProvider: page.NopPage, RefProvider: page.NopPage,
ShortcodeInfoProvider: page.NopPage, ShortcodeInfoProvider: page.NopPage,
LanguageProvider: s, LanguageProvider: s,
pagePages: &pagePages{},
InternalDependencies: s, InternalDependencies: s,
init: lazy.New(), init: lazy.New(),

1
hugolib/site.go
View file

@ -1630,6 +1630,7 @@ func (s *Site) resetBuildState() {
s.init.Reset() s.init.Reset()
for _, p := range s.rawAllPages { for _, p := range s.rawAllPages {
p.pagePages = &pagePages{}
p.subSections = page.Pages{} p.subSections = page.Pages{}
p.parent = nil p.parent = nil
p.Scratcher = maps.NewScratcher() p.Scratcher = maps.NewScratcher()