From 23ff79580924d78dd8557cbcd38adb61738f8961 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 5 May 2016 10:23:02 +0100 Subject: [PATCH 1/3] Don't pass through default order value when updating group --- app/Http/Controllers/Api/ComponentGroupController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/ComponentGroupController.php b/app/Http/Controllers/Api/ComponentGroupController.php index f99c0987..10bb9c59 100644 --- a/app/Http/Controllers/Api/ComponentGroupController.php +++ b/app/Http/Controllers/Api/ComponentGroupController.php @@ -89,7 +89,7 @@ class ComponentGroupController extends AbstractApiController $group = dispatch(new UpdateComponentGroupCommand( $group, Binput::get('name'), - Binput::get('order', 0), + Binput::get('order'), Binput::get('collapsed') )); } catch (QueryException $e) { From bd35db8d878598673fe3380394cf03c555edba02 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 5 May 2016 10:23:18 +0100 Subject: [PATCH 2/3] Default collapsed value to 0 (always open) --- app/Http/Controllers/Api/ComponentGroupController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/ComponentGroupController.php b/app/Http/Controllers/Api/ComponentGroupController.php index 10bb9c59..0898aac8 100644 --- a/app/Http/Controllers/Api/ComponentGroupController.php +++ b/app/Http/Controllers/Api/ComponentGroupController.php @@ -67,7 +67,7 @@ class ComponentGroupController extends AbstractApiController $group = dispatch(new AddComponentGroupCommand( Binput::get('name'), Binput::get('order', 0), - Binput::get('collapsed') + Binput::get('collapsed', 0) )); } catch (QueryException $e) { throw new BadRequestHttpException(); From 9747cb92048041c2dcbaeb27fc12609c0497c03c Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 5 May 2016 10:24:01 +0100 Subject: [PATCH 3/3] Added missing docblock --- app/Http/Controllers/Api/ComponentGroupController.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Http/Controllers/Api/ComponentGroupController.php b/app/Http/Controllers/Api/ComponentGroupController.php index 0898aac8..9c424b79 100644 --- a/app/Http/Controllers/Api/ComponentGroupController.php +++ b/app/Http/Controllers/Api/ComponentGroupController.php @@ -20,6 +20,13 @@ use Illuminate\Database\QueryException; use Illuminate\Support\Facades\Request; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; +/** + * This is the component group controller. + * + * @author James Brooks + * @author Graham Campbell + * @author Joe Cohen + */ class ComponentGroupController extends AbstractApiController { /**