diff --git a/src/Http/Controllers/CP/Assets/AssetContainersController.php b/src/Http/Controllers/CP/Assets/AssetContainersController.php index a952dfacd4f..64347fd9ccb 100644 --- a/src/Http/Controllers/CP/Assets/AssetContainersController.php +++ b/src/Http/Controllers/CP/Assets/AssetContainersController.php @@ -18,7 +18,7 @@ public function show($container) public function index(Request $request) { - $containers = AssetContainer::all()->filter(function ($container) { + $containers = AssetContainer::all()->sortBy->title()->filter(function ($container) { return User::current()->can('view', $container); })->map(function ($container) { return [ diff --git a/src/Http/Controllers/CP/Assets/RedirectsToFirstAssetContainer.php b/src/Http/Controllers/CP/Assets/RedirectsToFirstAssetContainer.php index df23c788bb1..6430e84bb91 100644 --- a/src/Http/Controllers/CP/Assets/RedirectsToFirstAssetContainer.php +++ b/src/Http/Controllers/CP/Assets/RedirectsToFirstAssetContainer.php @@ -9,7 +9,7 @@ trait RedirectsToFirstAssetContainer { public function redirectToFirstContainer() { - $containers = AssetContainer::all()->filter(function ($container) { + $containers = AssetContainer::all()->sortBy->title()->filter(function ($container) { return User::current()->can('view', $container); }); diff --git a/tests/Feature/AssetContainers/ListAssetContainersTest.php b/tests/Feature/AssetContainers/ListAssetContainersTest.php index d7ecb657ae5..bae094e710e 100644 --- a/tests/Feature/AssetContainers/ListAssetContainersTest.php +++ b/tests/Feature/AssetContainers/ListAssetContainersTest.php @@ -50,30 +50,30 @@ public function containerArray() { return [ [ - 'id' => 'two', - 'title' => 'Two', + 'id' => 'three', + 'title' => 'Three', 'allow_downloading' => true, 'allow_moving' => true, 'allow_renaming' => true, 'allow_uploads' => true, 'create_folders' => true, - 'edit_url' => 'http://localhost/cp/asset-containers/two/edit', - 'delete_url' => 'http://localhost/cp/asset-containers/two', - 'blueprint_url' => 'http://localhost/cp/asset-containers/two/blueprint', + 'edit_url' => 'http://localhost/cp/asset-containers/three/edit', + 'delete_url' => 'http://localhost/cp/asset-containers/three', + 'blueprint_url' => 'http://localhost/cp/asset-containers/three/blueprint', 'can_edit' => false, 'can_delete' => false, ], [ - 'id' => 'three', - 'title' => 'Three', + 'id' => 'two', + 'title' => 'Two', 'allow_downloading' => true, 'allow_moving' => true, 'allow_renaming' => true, 'allow_uploads' => true, 'create_folders' => true, - 'edit_url' => 'http://localhost/cp/asset-containers/three/edit', - 'delete_url' => 'http://localhost/cp/asset-containers/three', - 'blueprint_url' => 'http://localhost/cp/asset-containers/three/blueprint', + 'edit_url' => 'http://localhost/cp/asset-containers/two/edit', + 'delete_url' => 'http://localhost/cp/asset-containers/two', + 'blueprint_url' => 'http://localhost/cp/asset-containers/two/blueprint', 'can_edit' => false, 'can_delete' => false, ],