diff options
| author | Bjørn Erik Pedersen <[email protected]> | 2020-06-16 15:43:50 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <[email protected]> | 2020-06-18 09:09:56 +0200 |
| commit | fc045e12a953aac88b942c25b958c5c0554b252b (patch) | |
| tree | ad8e171d0730f55eb9a531c1a9f0a8dfb51065ad /hugolib/page.go | |
| parent | 9679023f2b0d7c55b70f23fd94603f301a841079 (diff) | |
| download | hugo-fc045e12a953aac88b942c25b958c5c0554b252b.tar.gz hugo-fc045e12a953aac88b942c25b958c5c0554b252b.zip | |
Rename taxonomy kinds from taxonomy to term, taxonomyTerm to taxonomy
And we have taken great measures to limit potential site breakage:
* For `disableKinds` and `outputs` we try to map from old to new values if possible, if not we print an ERROR that can be toggled off if not relevant.
* The layout lookup is mostly compatible with more options for the new `term` kind.
That leaves:
* Where queries in site.Pages using taxonomy/taxonomyTerm Kind values as filter.
* Other places where these kind value are used in the templates (classes etc.)
Fixes #6911
Fixes #7395
Diffstat (limited to 'hugolib/page.go')
| -rw-r--r-- | hugolib/page.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hugolib/page.go b/hugolib/page.go index baf5e7f69..28ef1e156 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -212,9 +212,9 @@ func (p *pageState) RegularPages() page.Pages { switch p.Kind() { case page.KindPage: - case page.KindSection, page.KindHome, page.KindTaxonomyTerm: + case page.KindSection, page.KindHome, page.KindTaxonomy: pages = p.getPages() - case page.KindTaxonomy: + case page.KindTerm: all := p.Pages() for _, p := range all { if p.IsPage() { @@ -240,9 +240,9 @@ func (p *pageState) Pages() page.Pages { case page.KindPage: case page.KindSection, page.KindHome: pages = p.getPagesAndSections() - case page.KindTaxonomy: + case page.KindTerm: pages = p.bucket.getTaxonomyEntries() - case page.KindTaxonomyTerm: + case page.KindTaxonomy: pages = p.bucket.getTaxonomies() default: pages = p.s.Pages() @@ -436,7 +436,7 @@ func (p *pageState) getLayoutDescriptor() output.LayoutDescriptor { if len(sections) > 0 { section = sections[0] } - case page.KindTaxonomyTerm, page.KindTaxonomy: + case page.KindTaxonomy, page.KindTerm: b := p.getTreeRef().n section = b.viewInfo.name.singular default: |