From 5481d716b909decf287e9cc2c14e1284620f9531 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sun, 19 Feb 2017 11:00:40 +0000 Subject: [PATCH] Fix ordering of component group statuses. Closes #2342 --- app/Models/ComponentGroup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/ComponentGroup.php b/app/Models/ComponentGroup.php index f130cf49..b595b990 100644 --- a/app/Models/ComponentGroup.php +++ b/app/Models/ComponentGroup.php @@ -125,7 +125,7 @@ class ComponentGroup extends Model implements HasPresenter */ public function components() { - return $this->hasMany(Component::class, 'group_id', 'id')->orderBy('order'); + return $this->hasMany(Component::class, 'group_id', 'id'); } /** @@ -145,7 +145,7 @@ class ComponentGroup extends Model implements HasPresenter */ public function enabled_components() { - return $this->components()->enabled(); + return $this->components()->enabled()->orderBy('order'); } /**