github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-03-21 09:11:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

hugolib: Add terms' pages to .Data.Pages

Browse source 
Fixes #2826
This commit is contained in:
Bjørn Erik Pedersen 2017-02-22 21:13:21 +01:00
parent 9e6b5eb98e
commit e117b1b2c7
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hugolib/page.go
View file

@ -1595,10 +1595,17 @@ func (p *Page) prepareData(s *Site) error {
case KindTaxonomyTerm: case KindTaxonomyTerm:
plural := p.sections[0] plural := p.sections[0]
singular := s.taxonomiesPluralSingular[plural] singular := s.taxonomiesPluralSingular[plural]
terms := s.Taxonomies[plural]
for _, tax := range terms {
pages = append(pages, tax.Pages()...)
}
pages = pages.ByWeight()
p.Data["Singular"] = singular p.Data["Singular"] = singular
p.Data["Plural"] = plural p.Data["Plural"] = plural
p.Data["Terms"] = s.Taxonomies[plural] p.Data["Terms"] = terms
// keep the following just for legacy reasons // keep the following just for legacy reasons
p.Data["OrderedIndex"] = p.Data["Terms"] p.Data["OrderedIndex"] = p.Data["Terms"]
p.Data["Index"] = p.Data["Terms"] p.Data["Index"] = p.Data["Terms"]

12
hugolib/taxonomy_test.go
View file

@ -84,6 +84,7 @@ others:
writeSource(t, fs, "content/p1.md", fmt.Sprintf(pageTemplate, "t1/c1", "- tag1", "- cat1", "- o1")) writeSource(t, fs, "content/p1.md", fmt.Sprintf(pageTemplate, "t1/c1", "- tag1", "- cat1", "- o1"))
writeSource(t, fs, "content/p2.md", fmt.Sprintf(pageTemplate, "t2/c1", "- tag2", "- cat1", "- o1")) writeSource(t, fs, "content/p2.md", fmt.Sprintf(pageTemplate, "t2/c1", "- tag2", "- cat1", "- o1"))
writeSource(t, fs, "content/p3.md", fmt.Sprintf(pageTemplate, "t2/c12", "- tag2", "- cat2", "- o1"))
writeNewContentFile(t, fs, "Category Terms", "2017-01-01", "content/categories/_index.md", 10) writeNewContentFile(t, fs, "Category Terms", "2017-01-01", "content/categories/_index.md", 10)
writeNewContentFile(t, fs, "Tag1 List", "2017-01-01", "content/tags/tag1/_index.md", 10) writeNewContentFile(t, fs, "Tag1 List", "2017-01-01", "content/tags/tag1/_index.md", 10)
@ -110,4 +111,15 @@ others:
th.assertFileContent("public/others/o1/index.html", "List", "O1") th.assertFileContent("public/others/o1/index.html", "List", "O1")
th.assertFileContent("public/others/index.html", "Terms List", "Others") th.assertFileContent("public/others/index.html", "Terms List", "Others")
s := h.Sites[0]
cat1 := s.getPage(KindTaxonomy, "categories", "cat1")
require.NotNil(t, cat1)
require.Len(t, cat1.Pages, 2)
cat := s.getPage(KindTaxonomyTerm, "categories")
require.NotNil(t, cat)
require.Len(t, cat.Pages, 3)
require.Len(t, cat.Data["Pages"], 3)
require.Equal(t, "t1/c1", cat.Pages[0].Title)
} }