Skip to content
Permalink
Browse files

hugolib: Fix Pages reinitialization on rebuilds

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

Fixes #5833
  • Loading branch information...
bep committed Apr 17, 2019
1 parent 2957795 commit 9b17cbb62a056ea7e26b1146cbf3ba42f5acf805
Showing with 17 additions and 5 deletions.
  1. +9 −3 hugolib/hugo_sites_rebuild_test.go
  2. +6 −2 hugolib/page__common.go
  3. +1 −0 hugolib/page__new.go
  4. +1 −0 hugolib/site.go
@@ -52,13 +52,16 @@ Content.

b.WithTemplatesAdded("index.html", `
{{ 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 }}
`)

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, `
---
@@ -72,6 +75,9 @@ Edited content.

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>")

}
@@ -87,8 +87,7 @@ type pageCommon struct {
page.InternalDependencies

// The children. Regular pages will have none.
pages page.Pages
pagesInit sync.Once
*pagePages

// Any bundled resources
resources resource.Resources
@@ -111,3 +110,8 @@ type pageCommon struct {
// Set in fast render mode to force render a given page.
forceRender bool
}

type pagePages struct {
pages page.Pages
pagesInit sync.Once
}
@@ -57,6 +57,7 @@ func newPageBase(metaProvider *pageMeta) (*pageState, error) {
RefProvider: page.NopPage,
ShortcodeInfoProvider: page.NopPage,
LanguageProvider: s,
pagePages: &pagePages{},

InternalDependencies: s,
init: lazy.New(),
@@ -1630,6 +1630,7 @@ func (s *Site) resetBuildState() {
s.init.Reset()

for _, p := range s.rawAllPages {
p.pagePages = &pagePages{}
p.subSections = page.Pages{}
p.parent = nil
p.Scratcher = maps.NewScratcher()

0 comments on commit 9b17cbb

Please sign in to comment.
You can’t perform that action at this time.