From ff91a2924d855c14178f069e46fdd28f3bc4ab83 Mon Sep 17 00:00:00 2001
From: Benjamin <brannow@users.noreply.github.com>
Date: Sat, 29 Nov 2025 00:18:09 +0700
Subject: [PATCH 1/2] Add piVars to Pagination partial rendering

---
 Resources/Private/Templates/Module/List.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Private/Templates/Module/List.html b/Resources/Private/Templates/Module/List.html
index a6c2cb569..fd08cd3f4 100644
--- a/Resources/Private/Templates/Module/List.html
+++ b/Resources/Private/Templates/Module/List.html
@@ -26,7 +26,7 @@ <h1><f:translate key="BackendListTitle" /></h1>
 			<f:then>
 				<f:render partial="Module/List" arguments="{_all}" />
 				<f:render partial="Module/SelectedLineMessage" arguments="{_all}" />
-				<f:render partial="Module/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
+				<f:render partial="Module/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator, piVars: piVars}" />
 			</f:then>
 			<f:else>
 				<h3><f:translate key="BackendListNoMails" /></h3>

From d963bdcf9d46cb3af82d71ccb431f273f220848a Mon Sep 17 00:00:00 2001
From: Benjamin <brannow@users.noreply.github.com>
Date: Sat, 29 Nov 2025 00:19:06 +0700
Subject: [PATCH 2/2] Add filter and sorting to pagination links

---
 Resources/Private/Partials/Module/Pagination.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Private/Partials/Module/Pagination.html b/Resources/Private/Partials/Module/Pagination.html
index 2d67d8d87..7fc6efbf3 100644
--- a/Resources/Private/Partials/Module/Pagination.html
+++ b/Resources/Private/Partials/Module/Pagination.html
@@ -3,7 +3,7 @@
         <f:if condition="{pagination.previousPageNumber} && {pagination.previousPageNumber} >= {pagination.firstPageNumber}">
             <f:then>
                 <li class="page-item previous">
-                    <a href="{f:uri.action(action:actionName, arguments:{currentPage: pagination.previousPageNumber})}"
+                    <a href="{f:uri.action(action:actionName, arguments:{currentPage: pagination.previousPageNumber, filter: piVars.filter, sorting: piVars.sorting})}"
                        title="{f:translate(key:'pagination.previous')}" class="page-link">
                         {f:translate(key:'widget.pagination.previous', extensionName: 'fluid')}
                     </a>
@@ -17,7 +17,7 @@
         </f:if>
         <f:for each="{pagination.allPageNumbers}" as="page">
             <li class="page-item {f:if(condition: '{page} == {paginator.currentPageNumber}', then:'active')}">
-                <a href="{f:uri.action(action:actionName, arguments:{currentPage: page})}" class="page-link">{page}</a>
+                <a href="{f:uri.action(action:actionName, arguments:{currentPage: page, filter: piVars.filter, sorting: piVars.sorting})}" class="page-link">{page}</a>
             </li>
         </f:for>
         <f:if condition="{pagination.hasMorePages}">
@@ -26,7 +26,7 @@
         <f:if condition="{pagination.nextPageNumber} && {pagination.nextPageNumber} <= {pagination.lastPageNumber}">
             <f:then>
                 <li class="page-item next">
-                    <a href="{f:uri.action(action:actionName, arguments:{currentPage: pagination.nextPageNumber})}"
+                    <a href="{f:uri.action(action:actionName, arguments:{currentPage: pagination.nextPageNumber, filter: piVars.filter, sorting: piVars.sorting})}"
                        title="{f:translate(key:'pagination.next')}" class="page-link">
                         {f:translate(key:'widget.pagination.next', extensionName: 'fluid')}
                     </a>