From dd9b1baab0cb860a3eb32fd9043bac18cab3f9f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sun, 2 Jul 2017 18:20:14 +0200 Subject: [PATCH] hugolib: Make .Site.Sections return the top level sections See #3591 --- hugolib/site_sections.go | 31 +++++++------------------------ hugolib/site_sections_test.go | 1 + 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/hugolib/site_sections.go b/hugolib/site_sections.go index f8d9c9d1f..1dd010092 100644 --- a/hugolib/site_sections.go +++ b/hugolib/site_sections.go @@ -19,33 +19,16 @@ import ( "strconv" "strings" - "github.com/gohugoio/hugo/helpers" radix "github.com/hashicorp/go-immutable-radix" ) -// Deprecated: Use .Site.Home.Sections. -// TODO(bep) Hugo 0.23 = Reuse as an alias for home's sections. -func (s *SiteInfo) Sections() Taxonomy { - - helpText := `In Hugo 0.22 we introduced nested sections, so this method now returns an empty taxonomy. - -To list sections with its pages, you can do something like this: - -{{ range $.Site.Home.Sections }} - Section: {{ .Title }} - {{ range .Pages }} - Section Page: {{ .Title }} - {{ end }} -{{ end }} - -To get a specific section, you can do this: - -{{ $section := $.Site.GetPage "section" "blog" }} -` - - helpers.Deprecated("Site", "Sections", helpText, true) - - return Taxonomy{} +// Sections returns the top level sections. +func (s *SiteInfo) Sections() Pages { + home, err := s.Home() + if err == nil { + return home.Sections() + } + return nil } // Home is a shortcut to the home page, equivalent to .Site.GetPage "home". diff --git a/hugolib/site_sections_test.go b/hugolib/site_sections_test.go index 7479c45fc..77a85099c 100644 --- a/hugolib/site_sections_test.go +++ b/hugolib/site_sections_test.go @@ -246,6 +246,7 @@ PAG|{{ .Title }}|{{ $sect.InSection . }} assert.NotNil(home) assert.Len(home.Sections(), 9) + assert.Equal(home.Sections(), s.Info.Sections()) rootPage := s.getPage(KindPage, "mypage.md") assert.NotNil(rootPage)