From 9b46e62eb6c33b8f95e9d833cbb48b5de521fd5f Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 16 Oct 2018 21:42:08 +0200 Subject: [PATCH] match api end point with config changes. --- app/Api/V1/Requests/RuleRequest.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Api/V1/Requests/RuleRequest.php b/app/Api/V1/Requests/RuleRequest.php index f8e50e4da2..95f2316abf 100644 --- a/app/Api/V1/Requests/RuleRequest.php +++ b/app/Api/V1/Requests/RuleRequest.php @@ -75,8 +75,10 @@ class RuleRequest extends Request $validTriggers = array_keys(config('firefly.rule-triggers')); $validActions = array_keys(config('firefly.rule-actions')); - // some actions require text: - $contextActions = implode(',', config('firefly.rule-actions-text')); + // some triggers and actions require text: + $contextTriggers = implode(',', config('firefly.context-rule-triggers')); + $contextActions = implode(',', config('firefly.context-rule-actions')); + $rules = [ 'title' => 'required|between:1,100|uniqueObjectForUser:rules,title', @@ -86,7 +88,7 @@ class RuleRequest extends Request 'trigger' => 'required|in:store-journal,update-journal', 'rule_triggers.*.name' => 'required|in:' . implode(',', $validTriggers), 'rule_triggers.*.stop_processing' => 'boolean', - 'rule_triggers.*.value' => 'required|min:1|ruleTriggerValue', + 'rule_triggers.*.value' => 'required_if:rule_actions.*.type,' . $contextTriggers . '|min:1|ruleTriggerValue', 'rule_actions.*.name' => 'required|in:' . implode(',', $validActions), 'rule_actions.*.value' => 'required_if:rule_actions.*.type,' . $contextActions . '|ruleActionValue', 'rule_actions.*.stop_processing' => 'boolean',