mirror of
https://github.com/gohugoio/hugo.git
synced 2025-04-09 07:57:07 +00:00
Fixed bug where Url specified in front matter as pretty url wouldnt render
Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
This commit is contained in:
parent
71678a7183
commit
4ed43e8076
2 changed files with 22 additions and 0 deletions
hugolib
|
@ -332,6 +332,10 @@ func (s *Site) setOutFile(p *Page) {
|
||||||
// Always use Url if it's specified
|
// Always use Url if it's specified
|
||||||
if len(strings.TrimSpace(p.Url)) > 2 {
|
if len(strings.TrimSpace(p.Url)) > 2 {
|
||||||
p.OutFile = strings.TrimSpace(p.Url)
|
p.OutFile = strings.TrimSpace(p.Url)
|
||||||
|
|
||||||
|
if strings.HasSuffix(p.OutFile, "/") {
|
||||||
|
p.OutFile = p.OutFile + "index.html"
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,12 @@ content`
|
||||||
var TEMPLATE_MISSING_FUNC = "{{ .Title | funcdoesnotexists }}"
|
var TEMPLATE_MISSING_FUNC = "{{ .Title | funcdoesnotexists }}"
|
||||||
var TEMPLATE_FUNC = "{{ .Title | urlize }}"
|
var TEMPLATE_FUNC = "{{ .Title | urlize }}"
|
||||||
|
|
||||||
|
var PAGE_URL_SPECIFIED = `---
|
||||||
|
title: simple template
|
||||||
|
url: "mycategory/my-whatever-content/"
|
||||||
|
---
|
||||||
|
content`
|
||||||
|
|
||||||
func pageMust(p *Page, err error) *Page {
|
func pageMust(p *Page, err error) *Page {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
|
@ -159,3 +165,15 @@ func TestRenderThingOrDefault(t *testing.T) {
|
||||||
t.Errorf("Content does not match. Expected '%s', got '%s'", test.expected, html)
|
t.Errorf("Content does not match. Expected '%s', got '%s'", test.expected, html)
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
func TestSetOutFile(t *testing.T) {
|
||||||
|
s := new(Site)
|
||||||
|
p := pageMust(ReadFrom(strings.NewReader(PAGE_URL_SPECIFIED), "content/a/file.md"))
|
||||||
|
s.setOutFile(p)
|
||||||
|
|
||||||
|
expected := "mycategory/my-whatever-content/index.html"
|
||||||
|
|
||||||
|
if p.OutFile != "mycategory/my-whatever-content/index.html" {
|
||||||
|
t.Errorf("Outfile does not match. Expected '%s', got '%s'", expected, p.OutFile)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue