ref: 0eb76b0863666ee99b8643a37bcb46eb1c4a8043
parent: a8a8249f67b3725b68316f5e22410554405d1e5e
author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
date: Sat Feb 25 13:14:48 EST 2017
Revert "hugolib: Add terms' pages to .Data.Pages" This reverts commit e117b1b2c7d18f25e1b7094fd7edb5e12721b79d. Will have to think a little about this.
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -1595,17 +1595,10 @@
case KindTaxonomyTerm:
plural := p.sections[0]
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["Plural"] = plural
- p.Data["Terms"] = terms
+ p.Data["Terms"] = s.Taxonomies[plural]
// keep the following just for legacy reasons
p.Data["OrderedIndex"] = p.Data["Terms"]
p.Data["Index"] = p.Data["Terms"]
--- a/hugolib/taxonomy_test.go
+++ b/hugolib/taxonomy_test.go
@@ -124,15 +124,6 @@
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)
// Issue #3070 preserveTaxonomyNames
if preserveTaxonomyNames {
--
⑨