IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Attempt at validating.

Browse Source
This commit is contained in:
James Cole
2016-01-14 18:57:52 +01:00
parent cd60b852a1
commit 42203ba872
5 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/RuleController.php
View File

@@ -101,8 +101,9 @@ class RuleController extends Controller
// has old input?
if (Input::old()) {
// process old triggers.
$newIndex = 0;
foreach (Input::old('rule-trigger') as $index => $entry) {
$count = ($index + 1);
$count = ($newIndex + 1);
$triggerCount++;
$oldTrigger = $entry;
$oldValue = Input::old('rule-trigger-value')[$index];
@@ -117,6 +118,7 @@ class RuleController extends Controller
'count' => $count
]
)->render();
$newIndex++;
}
// echo '<pre>';
// var_dump(Input::old());

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

@@ -49,7 +49,10 @@ class RuleFormRequest extends Request
'description' => 'between:1,5000',
'stop_processing' => 'boolean',
'trigger' => 'required|in:store-journal,update-journal',
'rule-trigger.*' => 'required|in:' . join(',', $validTriggers)
'rule-trigger.*' => 'required|in:' . join(',', $validTriggers),
'rule-trigger-value.*' => 'required|min:1'
];
}
}