Skip to content

Commit 947df45

Browse files
committed
Perform ordering after query manipulation to allow for unions to be affect by ordering (breaking change)
1 parent 4d86dcc commit 947df45

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/DataTableResponder.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,17 @@ public function setResponseMeta(array $meta = [])
141141
*/
142142
private function buildQuery(Request $request)
143143
{
144+
$query = $this->model->query();
145+
146+
$queryManipulator = $this->queryManipulator;
147+
148+
if ($queryManipulator) {
149+
$queryManipulator($query);
150+
}
151+
144152
$orderByField = $request->get('orderByField');
145153
$orderByDirection = $request->get('orderByDirection');
146154

147-
$query = $this->model->query();
148-
149155
if ($orderByField && $orderByDirection) {
150156
if (!in_array(strtolower($orderByDirection), ['asc', 'desc'])) {
151157
throw new InvalidArgumentException('Order by direction must be either asc or desc.');
@@ -161,12 +167,6 @@ private function buildQuery(Request $request)
161167
}
162168
}
163169

164-
$queryManipulator = $this->queryManipulator;
165-
166-
if ($queryManipulator) {
167-
$queryManipulator($query);
168-
}
169-
170170
return $query;
171171
}
172172

0 commit comments

Comments
 (0)