Orchestra\Support\Traits\QueryFilterTrait::setupBasicQueryFilter() …

…should allow filtering none `*_at` fields. Signed-off-by: crynobone <[email protected]>
orchestral · Jul 26, 2014 · 61fa572 · 61fa572
1 parent f26dd69
commit 61fa572
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/docs/changes.md b/docs/changes.md
@@ -5,6 +5,10 @@ title: Support Change Log
 
 ## Version 2.2 {#v2-2}
 
+### v2.2.2 {#v2-2-2}
+
+* `Orchestra\Support\Traits\QueryFilterTrait::setupBasicQueryFilter()` should allow filtering none `*_at` fields.
+
 ### v2.2.1 {#v2-2-1}
 
 * Fixes exception shouldn't be thrown when casting `Orchestra\Support\Collection` to CSV when no data is available.

diff --git a/src/Support/Traits/QueryFilterTrait.php b/src/Support/Traits/QueryFilterTrait.php
@@ -14,15 +14,17 @@ trait QueryFilterTrait
      */
     protected function setupBasicQueryFilter($query, array $input = array())
     {
-        $order = Arr::get($input, 'order', null);
-        $sort  = Str::upper(array_get($input, 'sort', ''));
+        $order = Arr::get($input, 'order', '');
+        $sort  = Str::upper(Arr::get($input, 'sort', null));
 
         ! in_array($sort, ['ASC', 'DESC']) && $sort = 'ASC';
 
         if (in_array($order, ['created', 'updated', 'deleted'])) {
-            $query->orderBy("{$order}_at", $sort);
+            $order = "{$order}_at";
         }
 
+        ! empty($order) && $query->orderBy($order, $sort);
+
         return $query;
     }