embedded: Always show page number when 5 pages or less

Fixes #7523

diff --git a/tpl/tplimpl/embedded/templates.autogen.go b/tpl/tplimpl/embedded/templates.autogen.go
index ccdc9197bde9bee6e79996811d4cd9b6746dedbd..1bed51420757cbc97e758ef0416844b7b2a686de 100644 (file)
--- a/tpl/tplimpl/embedded/templates.autogen.go
+++ b/tpl/tplimpl/embedded/templates.autogen.go
@@ -263,6 +263,7 @@ if (!doNotTrack) {
   {{- range $pag.Pagers -}}
   {{- $right := sub .TotalPages .PageNumber -}}
   {{- $showNumber := or (le .PageNumber 3) (eq $right 0) -}}
+  {{- $showNumber := or $showNumber (le .TotalPages 5) -}}{{/* Issue #7523 */}}
   {{- $showNumber := or $showNumber (and (gt .PageNumber (sub $pag.PageNumber 2)) (lt .PageNumber (add $pag.PageNumber 2))) -}}
   {{- if $showNumber -}}
     {{- $ellipsed = false -}}

diff --git a/tpl/tplimpl/embedded/templates/pagination.html b/tpl/tplimpl/embedded/templates/pagination.html
index 7b60c5d059138dc8ec12f3bbe2149db0b061d963..0984b6f9e9844874a6cdc0fac22319d6e7be5560 100644 (file)
--- a/tpl/tplimpl/embedded/templates/pagination.html
+++ b/tpl/tplimpl/embedded/templates/pagination.html
@@ -14,6 +14,7 @@
   {{- range $pag.Pagers -}}
   {{- $right := sub .TotalPages .PageNumber -}}
   {{- $showNumber := or (le .PageNumber 3) (eq $right 0) -}}
+  {{- $showNumber := or $showNumber (le .TotalPages 5) -}}{{/* Issue #7523 */}}
   {{- $showNumber := or $showNumber (and (gt .PageNumber (sub $pag.PageNumber 2)) (lt .PageNumber (add $pag.PageNumber 2))) -}}
   {{- if $showNumber -}}
     {{- $ellipsed = false -}}