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

Revert "hugolib: Add terms' pages to .Data.Pages"

Browse source 
This reverts commit e117b1b2c7.

Will have to think a little about this.
This commit is contained in:
Bjørn Erik Pedersen 2017-02-25 18:14:48 +01:00
parent a8a8249f67
commit 0eb76b0863
2 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hugolib/page.go
View file

@ -1595,17 +1595,10 @@ 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"] = terms p.Data["Terms"] = s.Taxonomies[plural]
// 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"]

9
hugolib/taxonomy_test.go
View file

@ -124,15 +124,6 @@ others:
th.assertFileContent("public/others/index.html", "Terms List", "Others") th.assertFileContent("public/others/index.html", "Terms List", "Others")
s := h.Sites[0] 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)
// Issue #3070 preserveTaxonomyNames // Issue #3070 preserveTaxonomyNames
if preserveTaxonomyNames { if preserveTaxonomyNames {