Harden OrderBys (#160)

Author: duncanmcclean

src/Http/Controllers/CP/Discounts/DiscountController.php

@@ -12,6 +12,7 @@
 use Statamic\Facades\Scope;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Http\Requests\FilteredRequest;
+use Statamic\Query\OrderBy;
 use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
 use Statamic\Support\Arr;
 
@@ -28,7 +29,7 @@ public function index(FilteredRequest $request)
 
             $activeFilterBadges = $this->queryFilters($query, $request->filters);
 
-            $sortField = request('sort');
+            $sortField = OrderBy::column(request('sort'));
             $sortDirection = request('order', 'asc');
 
             if (! $sortField && ! request('search')) {

src/Http/Controllers/CP/Orders/OrderController.php

@@ -14,6 +14,7 @@
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Http\Requests\FilteredRequest;
+use Statamic\Query\OrderBy;
 use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
 
 class OrderController extends CpController
@@ -29,7 +30,7 @@ public function index(FilteredRequest $request)
 
             $activeFilterBadges = $this->queryFilters($query, $request->filters);
 
-            $sortField = request('sort');
+            $sortField = OrderBy::column(request('sort'));
             $sortDirection = request('order', 'asc');
 
             if (! $sortField && ! request('search')) {