Fixes API sorting and filtering. Closes #1489

2016-02-23 13:34:22 -06:00
parent 98550c31c9
commit 919c7127e7
10 changed files with 136 additions and 14 deletions
@@ -29,7 +29,15 @@ class MetricController extends AbstractApiController
     */
    public function getMetrics()
    {
-        $metrics = Metric::paginate(Binput::get('per_page', 20));
+        $metrics = Metric::whereRaw('1=1');
+
+        if ($sortBy = Binput::get('sort')) {
+            $direction = Binput::has('order') && Binput::get('order') == 'desc';
+
+            $metrics->sort($sortBy, $direction);
+        }
+
+        $metrics = $metrics->paginate(Binput::get('per_page', 20));

        return $this->paginator($metrics, Request::instance());
    }