From 9675da4d93effbceaf006e03a77ed30ec3065205 Mon Sep 17 00:00:00 2001
From: Bernd Fallert <bernd.fallert@bib.uni-mannheim.de>
Date: Mon, 6 Nov 2023 11:18:36 +0100
Subject: [PATCH] [BUGFIX] Fix missing pagination between first and last page
 (#1076)

Co-authored-by: BFallert <bernd.fallert@uni-mannheim.de>
Co-authored-by: Sebastian Meyer <sebastian.meyer@opencultureconsulting.com>
---
 .../Private/Partials/Lists/Pagination.html    | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/Resources/Private/Partials/Lists/Pagination.html b/Resources/Private/Partials/Lists/Pagination.html
index 5f8fb5ca8..358a40be1 100644
--- a/Resources/Private/Partials/Lists/Pagination.html
+++ b/Resources/Private/Partials/Lists/Pagination.html
@@ -22,10 +22,27 @@
         <f:if condition="{pagination.hasLessPages}">
             <li>…</li>
         </f:if>
-        <f:for each="{pagination.allPageNumbers}" as="page">
-            <li class="{f:if(condition: '{page} == {paginator.currentPageNumber}', then:'current')}">
-                <f:link.action action="{action}" addQueryString="true" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': page}" arguments="{searchParameter: lastSearch}">{page}</f:link.action>
-            </li>
+        <f:comment>add pages between first and last page</f:comment>
+        <f:for each="{pagination.pages}" as="page">
+            <f:switch expression="{page}">
+                <f:comment>If page 1 is not to be output twice, please remove the comment</f:comment>
+                <f:comment>
+                    <f:case value="1">
+                        <f:comment>don't add first page a second time</f:comment>
+                    </f:case>
+                </f:comment>
+                <f:comment>If last page is not to be output twice, please remove the comment</f:comment>
+                <f:comment>
+                    <f:case value="{pagination.lastPageNumber}">
+                        <f:comment>don't add last page a second time</f:comment>
+                    </f:case>
+                </f:comment>
+                <f:defaultCase>
+                    <li class="{f:if(condition: '{page} == {paginator.currentPageNumber}', then:'current')}">
+                        <f:link.action action="{action}" addQueryString="true" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': page}" arguments="{searchParameter: lastSearch}">{page}</f:link.action>
+                    </li>
+                </f:defaultCase>
+            </f:switch>
         </f:for>
         <f:if condition="{pagination.hasMorePages}">
             <li>…</li>