mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-19 21:21:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename taxonomy kinds from taxonomy to term, taxonomyTerm to taxonomy

Browse Source 
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
This commit is contained in:
Bjørn Erik Pedersen
2020-06-16 15:43:50 +02:00
parent 9679023f2b
commit fc045e12a9
44 changed files with 644 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hugolib/page.go
View File

@@ -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: