diff options
| author | Bjørn Erik Pedersen <[email protected]> | 2019-04-17 10:36:36 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <[email protected]> | 2019-04-17 12:56:46 +0200 |
| commit | 9b17cbb62a056ea7e26b1146cbf3ba42f5acf805 (patch) | |
| tree | 28c79605fd536905bc365158993b2b2374045698 | |
| parent | 2957795f5276cc9bc8d438da2d7d9b61defea225 (diff) | |
| download | hugo-9b17cbb62a056ea7e26b1146cbf3ba42f5acf805.tar.gz hugo-9b17cbb62a056ea7e26b1146cbf3ba42f5acf805.zip | |
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
| -rw-r--r-- | hugolib/hugo_sites_rebuild_test.go | 12 | ||||
| -rw-r--r-- | hugolib/page__common.go | 8 | ||||
| -rw-r--r-- | hugolib/page__new.go | 1 | ||||
| -rw-r--r-- | hugolib/site.go | 1 |
4 files changed, 17 insertions, 5 deletions
diff --git a/hugolib/hugo_sites_rebuild_test.go b/hugolib/hugo_sites_rebuild_test.go index c2acbc238..4a81fe950 100644 --- a/hugolib/hugo_sites_rebuild_test.go +++ b/hugolib/hugo_sites_rebuild_test.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>") } diff --git a/hugolib/page__common.go b/hugolib/page__common.go index 01280bb40..f9ceee8c9 100644 --- a/hugolib/page__common.go +++ b/hugolib/page__common.go @@ -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 +} diff --git a/hugolib/page__new.go b/hugolib/page__new.go index 0ac14a5e8..c703867f1 100644 --- a/hugolib/page__new.go +++ b/hugolib/page__new.go @@ -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(), diff --git a/hugolib/site.go b/hugolib/site.go index 47ca77016..693c79f67 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -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() |