diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index fe70fd6937..9d6337e64e 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -548,10 +548,12 @@ class RuleController extends Controller { $ruleGroups = Auth::user() ->ruleGroups() + ->orderBy('active', 'DESC') ->orderBy('order', 'ASC') ->with( [ 'rules' => function ($query) { + $query->orderBy('active', 'DESC'); $query->orderBy('order', 'ASC'); }, diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig index 238a4a542b..546e74043b 100644 --- a/resources/views/rules/index.twig +++ b/resources/views/rules/index.twig @@ -28,7 +28,13 @@