Merge branch '1.2'

2015-08-08 17:38:28 +01:00
parent 88efff58cc 324f8703ce
commit ade85e24bd
4 changed files with 14 additions and 25 deletions
--- a/app/Http/Controllers/Api/AbstractApiController.php
+++ b/app/Http/Controllers/Api/AbstractApiController.php
@@ -159,7 +159,15 @@ abstract class AbstractApiController extends Controller
            ],
        ];

-        return $this->setMetaData($pagination)->setData(AutoPresenter::decorate($paginator->getCollection()))->respond();
+        $items = $paginator->getCollection();
+
+        if ($sortBy = $request->get('sort')) {
+            $direction = $request->has('order') && $request->get('order') == 'desc';
+
+            $items = $items->sortBy($sortBy, SORT_REGULAR, $direction);
+        }
+
+        return $this->setMetaData($pagination)->setData(AutoPresenter::decorate($items->values()->all()))->respond();
    }

    /**