From 5936107c076d46ea1e7b5f81f09028c51d73abfe Mon Sep 17 00:00:00 2001
From: Steve Mortimer <stevemortimer@users.noreply.github.com>
Date: Mon, 16 Jul 2018 08:43:47 -0500
Subject: [PATCH] Reset pagination on filter scope change (#3632)

Fixes #3610. Credit to @stevemortimer
---
 modules/backend/behaviors/ListController.php | 2 +-
 modules/backend/widgets/Lists.php            | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php
index 9007e07f0..c0c6898d3 100644
--- a/modules/backend/behaviors/ListController.php
+++ b/modules/backend/behaviors/ListController.php
@@ -239,7 +239,7 @@ class ListController extends ControllerBehavior
              * Filter the list when the scopes are changed
              */
             $filterWidget->bindEvent('filter.update', function () use ($widget, $filterWidget) {
-                return $widget->onRefresh();
+                return $widget->onFilter();
             });
 
             /*
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index d026add52..b468813cf 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -300,6 +300,15 @@ class Lists extends WidgetBase
         return $this->onRefresh();
     }
 
+    /**
+     * Event handler for changing the filter
+     */
+    public function onFilter()
+    {
+        $this->currentPageNumber = 1;
+        return $this->onRefresh();
+    }
+
     /**
      * Validate the supplied form model.
      * @return void