From b94561223edbd450af8a406b529315f8b4d7fab0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 1 Oct 2020 07:42:20 +0200 Subject: [PATCH] Fix search for #3850 --- app/Repositories/Rule/RuleRepository.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 40647899f7..f5e231f0a3 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -547,7 +547,14 @@ class RuleRepository implements RuleRepositoryInterface $params = []; /** @var RuleTrigger $trigger */ foreach ($rule->ruleTriggers as $trigger) { - if ('user_action' !== $trigger->trigger_type) { + if ('user_action' === $trigger->trigger_type) { + continue; + } + $needsContext = config(sprintf('firefly.search.operators.%s.needs_context', $trigger->trigger_type)) ?? true; + if (false === $needsContext) { + $params[] = sprintf('%s:true', OperatorQuerySearch::getRootOperator($trigger->trigger_type)); + } + if (true === $needsContext) { $params[] = sprintf('%s:"%s"', OperatorQuerySearch::getRootOperator($trigger->trigger_type), $trigger->trigger_value); } }