From 42706de9df4e13ccc1b4f7223b795c1a00a40467 Mon Sep 17 00:00:00 2001 From: James Collins Date: Thu, 11 May 2023 09:04:23 +1000 Subject: [PATCH] added defaultFilters option --- app/Conductors/Conductor.php | 10 +++++++++- app/Conductors/MediaConductor.php | 9 +++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/Conductors/Conductor.php b/app/Conductors/Conductor.php index 600b87a..135ac74 100644 --- a/app/Conductors/Conductor.php +++ b/app/Conductors/Conductor.php @@ -46,6 +46,13 @@ class Conductor */ protected $includes = []; + /** + * The default filters to use in a request. + * + * @var array + */ + protected $defaultFilters = []; + /** * The conductor collection. * @@ -223,7 +230,8 @@ class Conductor } $params = $request->all(); - $filterFields = array_intersect_key($params, array_flip($fields)); + $filterFields = (array_intersect_key($params, array_flip($fields)) + $conductor->defaultFilters); + print_r($filterFields); $conductor->filter($filterFields); if ($request->has('filter') === true) { $conductor->filterRaw($request->input('filter', ''), $fields); diff --git a/app/Conductors/MediaConductor.php b/app/Conductors/MediaConductor.php index 1571e39..9257bd1 100644 --- a/app/Conductors/MediaConductor.php +++ b/app/Conductors/MediaConductor.php @@ -27,6 +27,15 @@ class MediaConductor extends Conductor */ protected $includes = ['user']; + /** + * The default filters to use in a request. + * + * @var array + */ + protected $defaultFilters = [ + 'status' => 'ok' + ]; + /** * Return an array of model fields visible to the current user.