From e49a2b83ad9825a978ecbf0ff5fd9b7331690c17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sun, 26 Mar 2017 18:51:12 +0200 Subject: [PATCH] hugolib: Fix Render layouts for list pages --- hugolib/page_output.go | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/hugolib/page_output.go b/hugolib/page_output.go index 542c50e62..ed0678964 100644 --- a/hugolib/page_output.go +++ b/hugolib/page_output.go @@ -102,12 +102,19 @@ func (p *PageOutput) layouts(layouts ...string) []string { } func (p *PageOutput) Render(layout ...string) template.HTML { + if !p.checkRender() { + return template.HTML("") + } + l := p.layouts(layout...) return p.s.Tmpl.ExecuteTemplateToHTML(p, l...) } -// TODO(bep) output func (p *Page) Render(layout ...string) template.HTML { + if !p.checkRender() { + return template.HTML("") + } + p.pageOutputInit.Do(func() { // If Render is called in a range loop, the page output isn't available. // So, create one. @@ -126,6 +133,16 @@ func (p *Page) Render(layout ...string) template.HTML { return p.mainPageOutput.Render(layout...) } +// We may fix this in the future, but the layout handling in Render isn't built +// for list pages. +func (p *Page) checkRender() bool { + if p.Kind != KindPage { + p.s.Log.ERROR.Printf(".Render only available for regular pages, not for %q of kind %q", p.Path(), p.Kind) + return false + } + return true +} + // OutputFormats holds a list of the relevant output formats for a given resource. type OutputFormats []*OutputFormat