From 01d53bdb855fd695443add3ca30391f291b100d8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 17 Feb 2016 20:22:25 +0100 Subject: [PATCH] Use request instead of complex method. --- app/Http/Controllers/RuleController.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 1a0497a704..8aedfa430c 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -13,6 +13,7 @@ namespace FireflyIII\Http\Controllers; use Auth; use Config; use FireflyIII\Http\Requests\RuleFormRequest; +use FireflyIII\Http\Requests\TestRuleFormRequest; use FireflyIII\Models\Rule; use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleGroup; @@ -264,12 +265,15 @@ class RuleController extends Controller /** * @return \Illuminate\View\View */ - public function testTriggers() + public function testTriggers(TestRuleFormRequest $request) { - // Create a list of triggers - $triggers = $this->getValidTriggerList(); + $triggers = [ + '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')]); }