From 701b870922e856ab1c455f7270ba16020ecc1bd0 Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Sun, 18 Jan 2026 12:20:15 -0500 Subject: [PATCH 1/2] Add current form data as second argument to scope method --- modules/backend/formwidgets/RecordFinder.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/backend/formwidgets/RecordFinder.php b/modules/backend/formwidgets/RecordFinder.php index 0e5799cf0d..4b80995969 100644 --- a/modules/backend/formwidgets/RecordFinder.php +++ b/modules/backend/formwidgets/RecordFinder.php @@ -353,7 +353,8 @@ protected function makeListWidget() } elseif ($scopeMethod = $this->scope) { $widget->bindEvent('list.extendQueryBefore', function ($query) use ($scopeMethod) { - $query->$scopeMethod($this->model); + $formData = $this->getParentForm()->getSaveData(); + $query->$scopeMethod($this->model, $formData); }); } else { From a2de06c0e7df520650dfcd67b7df3ef5fbb95394 Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Sat, 10 Oct 2026 08:48:59 -0400 Subject: [PATCH 2/2] Prevents error if no parent form exists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Héctor pavez --- modules/backend/formwidgets/RecordFinder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/backend/formwidgets/RecordFinder.php b/modules/backend/formwidgets/RecordFinder.php index 4b80995969..12529d0d04 100644 --- a/modules/backend/formwidgets/RecordFinder.php +++ b/modules/backend/formwidgets/RecordFinder.php @@ -353,7 +353,7 @@ protected function makeListWidget() } elseif ($scopeMethod = $this->scope) { $widget->bindEvent('list.extendQueryBefore', function ($query) use ($scopeMethod) { - $formData = $this->getParentForm()->getSaveData(); + $formData = $this->getParentForm()?->getSaveData() ?? []; $query->$scopeMethod($this->model, $formData); }); }