kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 14:41:20 +00:00
Code Issues Projects Releases Wiki Activity

Some more rule things before I merge a change to the CSV importer.

Browse Source
This commit is contained in:
James Cole
2016-01-14 19:20:02 +01:00
parent 42203ba872
commit 9703439a4c
6 changed files with 86 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,21 +38,26 @@ class RuleFormRequest extends Request
{
$validTriggers = array_keys(Config::get('firefly.rule-triggers'));
$validActions = array_keys(Config::get('firefly.rule-actions'));
// some actions require text:
$contextActions = Config::get('firefly.rule-actions-text');
$titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title';
if (RuleGroup::find(Input::get('id'))) {
$titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . intval(Input::get('id'));
}
return [
'title' => $titleRule,
'description' => 'between:1,5000',
'stop_processing' => 'boolean',
'trigger' => 'required|in:store-journal,update-journal',
'rule-trigger.*' => 'required|in:' . join(',', $validTriggers),
'rule-trigger-value.*' => 'required|min:1'
$rules = [
'title' => $titleRule,
'description' => 'between:1,5000',
'stop_processing' => 'boolean',
'trigger' => 'required|in:store-journal,update-journal',
'rule-trigger.*' => 'required|in:' . join(',', $validTriggers),
'rule-trigger-value.*' => 'required|min:1',
'rule-action.*' => 'required|in:' . join(',', $validActions),
'rule-action-value.*' => 'required_if:rule-action.*,' . join(',', $contextActions)
];
}
}