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

hugolib: Introduce Page.NextPage and Page.PrevPage

Browse Source 
Introduce new page position variables in order to fix the ordering issue
of `.Next` and `.Prev` while also allowing an upgrade path via
deprecation.

`.NextInSection` becomes `.NextPageInSection`.
`.PrevInSection` becomes `.PrevPageInSection`.

`.Next` becomes a function returning `.PrevPage`.
`.Prev` becomes a function returning `.NextPage`.

Fixes #1061
This commit is contained in:
Ricardo N Feliciano
2018-09-24 18:06:29 -04:00
committed by Bjørn Erik Pedersen
parent 52ac85fbc4
commit ad705aac06
4 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hugolib/hugo_sites_build_test.go
View File

@@ -268,7 +268,7 @@ func doTestMultiSitesBuild(t *testing.T, configTemplate, configSuffix string) {
require.Equal(t, "/superbob", doc3.URL(), "invalid url, was specified on doc3")
b.AssertFileContent("public/superbob/index.html", "doc3|Hello|en")
require.Equal(t, doc2.Next, doc3, "doc3 should follow doc2, in .Next")
require.Equal(t, doc2.PrevPage, doc3, "doc3 should follow doc2, in .PrevPage")
doc1fr := doc1en.Translations()[0]
permalink = doc1fr.Permalink()
@@ -398,16 +398,16 @@ func doTestMultiSitesBuild(t *testing.T, configTemplate, configSuffix string) {
require.Equal(t, template.URL(""), enSite.RegularPages[0].RSSLink())
// Issue #3108
next := enSite.RegularPages[0].Next
require.NotNil(t, next)
require.Equal(t, KindPage, next.Kind)
prevPage := enSite.RegularPages[0].PrevPage
require.NotNil(t, prevPage)
require.Equal(t, KindPage, prevPage.Kind)
for {
if next == nil {
if prevPage == nil {
break
}
require.Equal(t, KindPage, next.Kind)
next = next.Next
require.Equal(t, KindPage, prevPage.Kind)
prevPage = prevPage.PrevPage
}
// Check bundles