diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index 939f227027..b0412960f6 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -35,11 +35,9 @@ class JsonController extends Controller } /** - * @param RuleAction|null $action - * * @return \Illuminate\Http\JsonResponse */ - public function action(RuleAction $action = null) + public function action() { $count = intval(Input::get('count')) > 0 ? intval(Input::get('count')) : 1; $keys = array_keys(Config::get('firefly.rule-actions')); @@ -47,8 +45,8 @@ class JsonController extends Controller foreach ($keys as $key) { $actions[$key] = trans('firefly.rule_action_' . $key . '_choice'); } + $view = view('rules.partials.action', compact('actions', 'count'))->render(); - $view = view('rules.partials.action', compact('actions', 'action', 'count'))->render(); return Response::json(['html' => $view]); @@ -301,11 +299,9 @@ class JsonController extends Controller } /** - * @param RuleTrigger|null $trigger - * * @return \Illuminate\Http\JsonResponse */ - public function trigger(RuleTrigger $trigger = null) + public function trigger() { $count = intval(Input::get('count')) > 0 ? intval(Input::get('count')) : 1; $keys = array_keys(Config::get('firefly.rule-triggers')); @@ -316,7 +312,7 @@ class JsonController extends Controller } } - $view = view('rules.partials.trigger', compact('triggers', 'trigger', 'count'))->render(); + $view = view('rules.partials.trigger', compact('triggers', 'count'))->render(); return Response::json(['html' => $view]); diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 518d104b38..e78e184eae 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -165,12 +165,7 @@ class RuleController extends Controller Session::flash('gaEventCategory', 'rules'); Session::flash('gaEventAction', 'edit-rule'); - return view( - 'rules.rule.edit', compact( - 'rule', 'subTitle', 'primaryTrigger', - 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount' - ) - ); + return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount')); } /** diff --git a/app/Http/routes.php b/app/Http/routes.php index 747682d5c2..c1405e09c0 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -202,8 +202,8 @@ Route::group( Route::get('/json/box/bills-paid', ['uses' => 'JsonController@boxBillsPaid', 'as' => 'json.box.unpaid']); Route::get('/json/transaction-journals/{what}', 'JsonController@transactionJournals'); - Route::get('/json/trigger/{RuleTrigger?}', ['uses' => 'JsonController@trigger', 'as' => 'json.trigger']); - Route::get('/json/action/{RuleAction?}', ['uses' => 'JsonController@action', 'as' => 'json.action']); + Route::get('/json/trigger', ['uses' => 'JsonController@trigger', 'as' => 'json.trigger']); + Route::get('/json/action', ['uses' => 'JsonController@action', 'as' => 'json.action']); /** * New user Controller