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

jbrooksuk · web-flow · commit 494badb00a77 · 2018-06-17T09:43:58.000+01:00
Fix the component group status
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');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ class ComponentGroup extends Model implements HasPresenter`
`99`	`99`	`*/`
`100`	`100`	`public function components()`
`101`	`101`	`{`
`102`		`- return $this->hasMany(Component::class, 'group_id', 'id')->orderBy('order');`
	`102`	`+ return $this->hasMany(Component::class, 'group_id', 'id');`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/**`
`@@ -119,7 +119,7 @@ public function incidents()`
`119`	`119`	`*/`
`120`	`120`	`public function enabled_components()`
`121`	`121`	`{`
`122`		`- return $this->components()->enabled();`
	`122`	`+ return $this->components()->enabled()->orderBy('order');`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`/**`