kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Some rule fixes.

Browse Source
This commit is contained in:
James Cole
2018-12-18 07:08:46 +01:00
parent a3f33ae888
commit e46561347d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Requests/RuleFormRequest.php
View File

@@ -88,10 +88,10 @@ class RuleFormRequest extends Request
'stop_processing' => 'boolean', 'stop_processing' => 'boolean',
'rule_group_id' => 'required|belongsToUser:rule_groups', 'rule_group_id' => 'required|belongsToUser:rule_groups',
'trigger' => 'required|in:store-journal,update-journal', 'trigger' => 'required|in:store-journal,update-journal',
'triggers.*.name' => 'required|in:' . implode(',', $validTriggers), 'triggers.*.type' => 'required|in:' . implode(',', $validTriggers),
'triggers.*.value' => sprintf('required_if:triggers.*.name,%s|min:1|ruleTriggerValue', $contextTriggers), 'triggers.*.value' => sprintf('required_if:triggers.*.type,%s|min:1|ruleTriggerValue', $contextTriggers),
'actions.*.name' => 'required|in:' . implode(',', $validActions), 'actions.*.type' => 'required|in:' . implode(',', $validActions),
'actions.*.value' => sprintf('required_if:actions.*.name,%s|min:1|ruleActionValue', $contextActions), 'actions.*.value' => sprintf('required_if:actions.*.type,%s|min:1|ruleActionValue', $contextActions),
'strict' => 'in:0,1', 'strict' => 'in:0,1',
]; ];
@@ -116,7 +116,7 @@ class RuleFormRequest extends Request
foreach ($actionData as $action) { foreach ($actionData as $action) {
$stopProcessing = $action['stop_processing'] ?? '0'; $stopProcessing = $action['stop_processing'] ?? '0';
$return[] = [ $return[] = [
'name' => $action['name'] ?? 'invalid', 'type' => $action['type'] ?? 'invalid',
'value' => $action['value'] ?? '', 'value' => $action['value'] ?? '',
'stop_processing' => 1 === (int)$stopProcessing, 'stop_processing' => 1 === (int)$stopProcessing,
]; ];
@@ -137,7 +137,7 @@ class RuleFormRequest extends Request
foreach ($triggerData as $trigger) { foreach ($triggerData as $trigger) {
$stopProcessing = $trigger['stop_processing'] ?? '0'; $stopProcessing = $trigger['stop_processing'] ?? '0';
$return[] = [ $return[] = [
'name' => $trigger['name'] ?? 'invalid', 'type' => $trigger['type'] ?? 'invalid',
'value' => $trigger['value'] ?? '', 'value' => $trigger['value'] ?? '',
'stop_processing' => 1 === (int)$stopProcessing, 'stop_processing' => 1 === (int)$stopProcessing,
]; ];

4
tests/Feature/Controllers/Rule/CreateControllerTest.php
View File

@@ -156,7 +156,7 @@ class CreateControllerTest extends TestCase
'description' => 'D', 'description' => 'D',
'rule_triggers' => [ 'rule_triggers' => [
[ [
'name' => 'description_is', 'type' => 'description_is',
'value' => 'A', 'value' => 'A',
'stop_processing' => '0', 'stop_processing' => '0',
@@ -164,7 +164,7 @@ class CreateControllerTest extends TestCase
], ],
'rule_actions' => [ 'rule_actions' => [
[ [
'name' => 'set_category', 'type' => 'set_category',
'value' => 'C', 'value' => 'C',
'stop_processing' => '0', 'stop_processing' => '0',