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

Use request instead of complex method.

Browse Source
This commit is contained in:
James Cole
2016-02-17 20:22:25 +01:00
parent 51acc34a80
commit 01d53bdb85
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ namespace FireflyIII\Http\Controllers;
use Auth; use Auth;
use Config; use Config;
use FireflyIII\Http\Requests\RuleFormRequest; use FireflyIII\Http\Requests\RuleFormRequest;
use FireflyIII\Http\Requests\TestRuleFormRequest;
use FireflyIII\Models\Rule; use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleGroup;
@@ -264,12 +265,15 @@ class RuleController extends Controller
/** /**
* @return \Illuminate\View\View * @return \Illuminate\View\View
*/ */
public function testTriggers() public function testTriggers(TestRuleFormRequest $request)
{ {
// Create a list of triggers $triggers = [
$triggers = $this->getValidTriggerList(); 'rule-triggers' => $request->get('rule-trigger'),
'rule-trigger-values' => $request->get('rule-trigger-value'),
'rule-trigger-stop' => $request->get('rule-trigger-stop'),
];
if (count($triggers) == 0) { if (count($triggers['rule-triggers']) == 0) {
return Response::json(['html' => '', 'warning' => trans('firefly.warning_no_valid_triggers')]); return Response::json(['html' => '', 'warning' => trans('firefly.warning_no_valid_triggers')]);
} }