kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-09 03:08:09 +00:00
Code Issues Projects Releases Wiki Activity

sprintf the rules

Browse Source
This commit is contained in:
James Cole
2024-03-10 06:24:32 +01:00
parent 1961487055
commit 53d84347c2
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Api/V1/Requests/Models/Rule/StoreRequest.php
View File

@@ -58,7 +58,6 @@ class StoreRequest extends FormRequest
'active' => ['active', 'boolean'], 'active' => ['active', 'boolean'],
]; ];
$data = $this->getAllData($fields); $data = $this->getAllData($fields);
$data['triggers'] = $this->getRuleTriggers(); $data['triggers'] = $this->getRuleTriggers();
$data['actions'] = $this->getRuleActions(); $data['actions'] = $this->getRuleActions();
@@ -124,7 +123,7 @@ class StoreRequest extends FormRequest
'triggers.*.stop_processing' => [new IsBoolean()], 'triggers.*.stop_processing' => [new IsBoolean()],
'triggers.*.active' => [new IsBoolean()], 'triggers.*.active' => [new IsBoolean()],
'actions.*.type' => 'required|in:' . implode(',', $validActions), 'actions.*.type' => 'required|in:' . implode(',', $validActions),
'actions.*.value' => ['required_if:actions.*.type,'.$contextActions, new IsValidActionExpression(), 'ruleActionValue'], 'actions.*.value' => [sprintf('required_if:actions.*.type,%s', $contextActions), new IsValidActionExpression(), 'ruleActionValue'],
'actions.*.stop_processing' => [new IsBoolean()], 'actions.*.stop_processing' => [new IsBoolean()],
'actions.*.active' => [new IsBoolean()], 'actions.*.active' => [new IsBoolean()],
'strict' => [new IsBoolean()], 'strict' => [new IsBoolean()],

2
app/Api/V1/Requests/Models/Rule/UpdateRequest.php
View File

@@ -141,7 +141,7 @@ class UpdateRequest extends FormRequest
'triggers.*.stop_processing' => [new IsBoolean()], 'triggers.*.stop_processing' => [new IsBoolean()],
'triggers.*.active' => [new IsBoolean()], 'triggers.*.active' => [new IsBoolean()],
'actions.*.type' => 'required|in:'.implode(',', $validActions), 'actions.*.type' => 'required|in:'.implode(',', $validActions),
'actions.*.value' => ['required_if:actions.*.type,'.$contextActions, new IsValidActionExpression(), 'ruleActionValue'], 'actions.*.value' => [sprintf('required_if:actions.*.type,%s',$contextActions), new IsValidActionExpression(), 'ruleActionValue'],
'actions.*.stop_processing' => [new IsBoolean()], 'actions.*.stop_processing' => [new IsBoolean()],
'actions.*.active' => [new IsBoolean()], 'actions.*.active' => [new IsBoolean()],
'strict' => [new IsBoolean()], 'strict' => [new IsBoolean()],