STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

fix scope to apply after filters

Browse Source
This commit is contained in:
James Collins
2023-03-28 20:25:21 +10:00
parent 79704e2f2b
commit b0a1197e22
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Conductors/Conductor.php
View File

@@ -215,9 +215,6 @@ class Conductor
throw new \Exception('Failed to create query builder instance for ' . $conductor->class . '.', 0, $e); throw new \Exception('Failed to create query builder instance for ' . $conductor->class . '.', 0, $e);
} }
// Scope query
$conductor->scope($conductor->query);
// Filter request // Filter request
$fields = $conductor->fields(new $conductor->class()); $fields = $conductor->fields(new $conductor->class());
if (is_array($fields) === false) { if (is_array($fields) === false) {
@@ -231,6 +228,11 @@ class Conductor
$conductor->filterRaw($request->input('filter', ''), $fields); $conductor->filterRaw($request->input('filter', ''), $fields);
} }
// After Scope query
$conductor->query->where(function ($query) use ($conductor) {
$conductor->scope($query);
});
// Sort request // Sort request
$conductor->sort($request->input('sort', $conductor->sort)); $conductor->sort($request->input('sort', $conductor->sort));
@@ -251,6 +253,7 @@ class Conductor
$conductor->collection = $conductor->query->get(); $conductor->collection = $conductor->query->get();
// Transform and Includes // Transform and Includes
$includes = $conductor->includes; $includes = $conductor->includes;
if ($request->has('includes') === true) { if ($request->has('includes') === true) {