Merge pull request #3069 from CachetHQ/fix-component-group-status

Fix the component group status
cachethq · Jun 17, 2018 · 494badb · 494badb
2 parents d7ffbee + 84bea58
commit 494badb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/Models/ComponentGroup.php b/app/Models/ComponentGroup.php
@@ -99,7 +99,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');
     }
 
     /**
@@ -119,7 +119,7 @@ public function incidents()
      */
     public function enabled_components()
     {
-        return $this->components()->enabled();
+        return $this->components()->enabled()->orderBy('order');
     }
 
     /**