github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-04-21 01:33:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

hugolib: Fix Render layouts for list pages

Browse source
This commit is contained in:
Bjørn Erik Pedersen 2017-03-26 18:51:12 +02:00
parent 9a0aa5fdbe
commit e49a2b83ad
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
hugolib/page_output.go
View file

@ -102,12 +102,19 @@ func (p *PageOutput) layouts(layouts ...string) []string {
} }
func (p *PageOutput) Render(layout ...string) template.HTML { func (p *PageOutput) Render(layout ...string) template.HTML {
if !p.checkRender() {
return template.HTML("")
}
l := p.layouts(layout...) l := p.layouts(layout...)
return p.s.Tmpl.ExecuteTemplateToHTML(p, l...) return p.s.Tmpl.ExecuteTemplateToHTML(p, l...)
} }
// TODO(bep) output
func (p *Page) Render(layout ...string) template.HTML { func (p *Page) Render(layout ...string) template.HTML {
if !p.checkRender() {
return template.HTML("")
}
p.pageOutputInit.Do(func() { p.pageOutputInit.Do(func() {
// If Render is called in a range loop, the page output isn't available. // If Render is called in a range loop, the page output isn't available.
// So, create one. // So, create one.
@ -126,6 +133,16 @@ func (p *Page) Render(layout ...string) template.HTML {
return p.mainPageOutput.Render(layout...) 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. // OutputFormats holds a list of the relevant output formats for a given resource.
type OutputFormats []*OutputFormat type OutputFormats []*OutputFormat