From e6338705a711d61a1e442da115c99d2e6eaf6e70 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Tue, 19 May 2020 19:37:12 +0200
Subject: [PATCH] Fix #3376

---
 .../RuleGroup/RuleGroupRepository.php             | 15 +++++++--------
 resources/views/v1/preferences/index.twig         |  2 ++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php
index a7bca56d6c..1d51301a19 100644
--- a/app/Repositories/RuleGroup/RuleGroupRepository.php
+++ b/app/Repositories/RuleGroup/RuleGroupRepository.php
@@ -92,7 +92,9 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
     {
         $this->user->ruleGroups()->whereNotNull('deleted_at')->update(['order' => 0]);
 
-        $set   = $this->user->ruleGroups()->where('active', 1)->orderBy('order', 'ASC')->get();
+        $set   = $this->user
+            ->ruleGroups()
+            ->orderBy('order', 'ASC')->get();
         $count = 1;
         /** @var RuleGroup $entry */
         foreach ($set as $entry) {
@@ -118,7 +120,6 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
         $ruleGroup->rules()->whereNotNull('deleted_at')->update(['order' => 0]);
 
         $set   = $ruleGroup->rules()
-                           ->orderBy('active','DESC')
                            ->orderBy('order', 'ASC')
                            ->orderBy('updated_at', 'DESC')
                            ->get();
@@ -214,18 +215,16 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
     public function getRuleGroupsWithRules(User $user): Collection
     {
         return $user->ruleGroups()
-                    ->orderBy('active', 'DESC')
                     ->orderBy('order', 'ASC')
                     ->with(
                         [
-                            'rules'              => function (HasMany $query) {
-                                $query->orderBy('active', 'DESC');
+                            'rules'              => static function (HasMany $query) {
                                 $query->orderBy('order', 'ASC');
                             },
-                            'rules.ruleTriggers' => function (HasMany $query) {
+                            'rules.ruleTriggers' => static function (HasMany $query) {
                                 $query->orderBy('order', 'ASC');
                             },
-                            'rules.ruleActions'  => function (HasMany $query) {
+                            'rules.ruleActions'  => static function (HasMany $query) {
                                 $query->orderBy('order', 'ASC');
                             },
                         ]
@@ -359,4 +358,4 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
         return $this->user->ruleGroups()->where('title', $title)->first();
     }
 
-}
\ No newline at end of file
+}
diff --git a/resources/views/v1/preferences/index.twig b/resources/views/v1/preferences/index.twig
index c264f9b936..b812970657 100644
--- a/resources/views/v1/preferences/index.twig
+++ b/resources/views/v1/preferences/index.twig
@@ -68,7 +68,9 @@
                                                     {% endfor %}
                                                 </select>
                                             </div></div>
+                                        {{ dump(IS_DEMO_SITE) }}
                                         <ul class="text-warning">
+
                                             {% if IS_DEMO_SITE %}<li class="text-danger">{{ 'pref_locale_no_demo'|_ }}</li>{% endif %}
                                             <li>{{ 'pref_locale_no_windows'|_ }}</li>
                                             <li>{{ 'pref_locale_no_docker'|_ }}</li>