fix(paginate): paginate error for empty content (#350)

dillonzq · May 12, 2020 · 7d0603e · 7d0603e
1 parent 13b051b
commit 7d0603e
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 37 deletions.
diff --git a/layouts/_default/section.html b/layouts/_default/section.html
@@ -10,25 +10,27 @@ <h2 class="single-title animated pulse faster">
         </h2>
 
         {{- /* Paginate */ -}}
-        {{- $pages := .Pages.GroupByDate "2006" -}}
-        {{- with .Site.Params.section.paginate | default .Site.Params.paginate -}}
-            {{- $pages = $.Paginate $pages . -}}
-        {{- else -}}
-            {{- $pages = .Paginate $pages -}}
-        {{- end -}}
-        {{- range $pages.PageGroups -}}
-            <h3 class="group-title">{{ .Key }}</h3>
-            {{- range .Pages -}}
-                <article class="archive-item">
-                    <a href="{{ .RelPermalink }}" class="archive-item-link">
-                        {{- .Title -}}
-                    </a>
-                    <span class="archive-item-date">
-                        {{- .Date.Format ($.Site.Params.section.dateFormat | default "01-02") -}}
-                    </span>
-                </article>
+        {{- if .Pages -}}
+            {{- $pages := .Pages.GroupByDate "2006" -}}
+            {{- with .Site.Params.section.paginate | default .Site.Params.paginate -}}
+                {{- $pages = $.Paginate $pages . -}}
+            {{- else -}}
+                {{- $pages = .Paginate $pages -}}
+            {{- end -}}
+            {{- range $pages.PageGroups -}}
+                <h3 class="group-title">{{ .Key }}</h3>
+                {{- range .Pages -}}
+                    <article class="archive-item">
+                        <a href="{{ .RelPermalink }}" class="archive-item-link">
+                            {{- .Title -}}
+                        </a>
+                        <span class="archive-item-date">
+                            {{- .Date.Format ($.Site.Params.section.dateFormat | default "01-02") -}}
+                        </span>
+                    </article>
+                {{- end -}}
             {{- end -}}
+            {{- partial "paginator.html" . -}}
         {{- end -}}
-        {{- partial "paginator.html" . -}}
     </div>
 {{- end -}}
diff --git a/layouts/index.html b/layouts/index.html
@@ -16,7 +16,7 @@
         {{- end -}}
 
         {{- /* Posts */ -}}
-        {{- if ne .Site.Params.home.posts.enable false -}}
+        {{- if ne .Site.Params.home.posts.enable false | and .Site.RegularPages -}}
             {{- /* Paginate */ -}}
             {{- $pages := where .Site.RegularPages "Type" "posts" -}}
             {{- if .Site.Params.page.hiddenFromHomePage -}}

diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html
@@ -17,25 +17,27 @@ <h2 class="single-title animated pulse faster">
         </h2>
 
         {{- /* Paginate */ -}}
-        {{- $pages := .Pages.GroupByDate "2006" -}}
-        {{- with .Site.Params.list.paginate | default .Site.Params.paginate -}}
-            {{- $pages = $.Paginate $pages . -}}
-        {{- else -}}
-            {{- $pages = .Paginate $pages -}}
-        {{- end -}}
-        {{- range $pages.PageGroups -}}
-            <h3 class="group-title">{{ .Key }}</h3>
-            {{- range .Pages -}}
-                <article class="archive-item">
-                    <a href="{{ .RelPermalink }}" class="archive-item-link">
-                        {{- .Title -}}
-                    </a>
-                    <span class="archive-item-date">
-                        {{- .Date.Format ($.Site.Params.list.dateFormat | default "01-02") -}}
-                    </span>
-                </article>
+        {{- if .Pages -}}
+            {{- $pages := .Pages.GroupByDate "2006" -}}
+            {{- with .Site.Params.list.paginate | default .Site.Params.paginate -}}
+                {{- $pages = $.Paginate $pages . -}}
+            {{- else -}}
+                {{- $pages = .Paginate $pages -}}
+            {{- end -}}
+            {{- range $pages.PageGroups -}}
+                <h3 class="group-title">{{ .Key }}</h3>
+                {{- range .Pages -}}
+                    <article class="archive-item">
+                        <a href="{{ .RelPermalink }}" class="archive-item-link">
+                            {{- .Title -}}
+                        </a>
+                        <span class="archive-item-date">
+                            {{- .Date.Format ($.Site.Params.list.dateFormat | default "01-02") -}}
+                        </span>
+                    </article>
+                {{- end -}}
             {{- end -}}
+            {{- partial "paginator.html" . -}}
         {{- end -}}
-        {{- partial "paginator.html" . -}}
     </div>
 {{- end -}}