github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

hugolib: Fix redundant URL file extension on taxonomy terms pages

Browse source 
Fixes #2819
This commit is contained in:
Cameron Moore 2016-12-26 20:36:08 -06:00 committed by Bjørn Erik Pedersen
parent e78dd3cd48
commit 17f851780c
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
hugolib/node_as_page_test.go
View file

@ -222,6 +222,19 @@ func doTestNodesWithNoContentFile(t *testing.T, ugly bool) {
"Taxonomy Terms Title: Categories", "Taxonomy Terms Title: Categories",
) )
pages := s.findPagesByKind(KindTaxonomyTerm)
for _, p := range pages {
var want string
if ugly {
want = "/" + p.Site.pathSpec.URLize(p.Title) + ".html"
} else {
want = "/" + p.Site.pathSpec.URLize(p.Title) + "/"
}
if p.URL() != want {
t.Errorf("Taxonomy term URL mismatch: want %q, got %q", want, p.URL())
}
}
// Sections // Sections
assertFileContent(t, expectedFilePath(ugly, "public", "sect1"), false, assertFileContent(t, expectedFilePath(ugly, "public", "sect1"), false,
"Section Title: Sect1s", "Section Title: Sect1s",

2
hugolib/page.go
View file

@ -758,7 +758,7 @@ func (p *Page) createPermalink() (*url.URL, error) {
// No permalink config for nodes (currently) // No permalink config for nodes (currently)
pURL := strings.TrimSpace(p.Site.pathSpec.URLize(p.URLPath.URL)) pURL := strings.TrimSpace(p.Site.pathSpec.URLize(p.URLPath.URL))
pURL = p.addLangPathPrefix(pURL) pURL = p.addLangPathPrefix(pURL)
pURL = p.Site.pathSpec.URLPrep(path.Join(pURL, "index."+p.Extension())) pURL = p.Site.pathSpec.URLPrep(pURL)
url := helpers.MakePermalink(baseURL, pURL) url := helpers.MakePermalink(baseURL, pURL)
return url, nil return url, nil
} }