From 7bd0b09711b9f52d69ec8d7be0081a6e569ffc3f Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 4 Oct 2020 13:45:39 +0200 Subject: [PATCH] Fix #3900 --- app/Repositories/Rule/RuleRepository.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 0a1ec2491f..f6b8e879f4 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -506,7 +506,7 @@ class RuleRepository implements RuleRepositoryInterface */ public function getStoreRules(): Collection { - $collection = $this->user->rules()->where('active', 1)->with(['ruleGroup', 'ruleTriggers'])->get(); + $collection = $this->user->rules()->where('rules.active', 1)->with(['ruleGroup', 'ruleTriggers'])->get(); $filtered = new Collection; /** @var Rule $rule */ foreach ($collection as $rule) { @@ -525,7 +525,7 @@ class RuleRepository implements RuleRepositoryInterface */ public function getUpdateRules(): Collection { - $collection = $this->user->rules()->with(['ruleGroup', 'ruleTriggers'])->get(); + $collection = $this->user->rules()->where('rules.active', 1)->with(['ruleGroup', 'ruleTriggers'])->get(); $filtered = new Collection; /** @var Rule $rule */ foreach ($collection as $rule) {