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

Removed parameter rule trigger / rule action since they weren't being used.

Browse Source
This commit is contained in:
James Cole 2016-01-24 16:12:59 +01:00
parent 92616c6ae3
commit 00a8a9ac0e
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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]);

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

@ -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'));
}
/**

4
app/Http/routes.php
View File

@ -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