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

Code cleanup

Browse Source
This commit is contained in:
James Cole
2016-01-15 13:13:33 +01:00
parent 651dff0750
commit 01792f91e2
6 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,7 @@ class RuleController extends Controller
'stop_processing' => $request->get('stop_processing'),
];
$rule = $repository->storeRule($data);
$rule = $repository->store($data);
Session::flash('success', trans('firefly.stored_new_rule', ['title' => $rule->title]));
Preferences::mark();
@@ -313,7 +313,7 @@ class RuleController extends Controller
'rule-action-stop' => $request->get('rule-action-stop'),
'stop_processing' => intval($request->get('stop_processing')) == 1,
];
$repository->updateRule($rule, $data);
$repository->update($rule, $data);
Session::flash('success', trans('firefly.updated_rule', ['title' => $rule->title]));
Preferences::mark();
@@ -358,7 +358,7 @@ class RuleController extends Controller
{
$title = $rule->title;
$repository->destroyRule($rule);
$repository->destroy($rule);
Session::flash('success', trans('firefly.deleted_rule', ['title' => $title]));
Preferences::mark();
@@ -439,7 +439,7 @@ class RuleController extends Controller
*/
public function up(RuleRepositoryInterface $repository, Rule $rule)
{
$repository->moveRuleUp($rule);
$repository->moveUp($rule);
return redirect(route('rules.index'));
@@ -453,7 +453,7 @@ class RuleController extends Controller
*/
public function down(RuleRepositoryInterface $repository, Rule $rule)
{
$repository->moveRuleDown($rule);
$repository->moveDown($rule);
return redirect(route('rules.index'));

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

@@ -64,7 +64,7 @@ class RuleGroupController extends Controller
'user' => Auth::user()->id,
];
$ruleGroup = $repository->storeRuleGroup($data);
$ruleGroup = $repository->store($data);
Session::flash('success', trans('firefly.created_new_rule_group', ['title' => $ruleGroup->title]));
Preferences::mark();
@@ -116,7 +116,7 @@ class RuleGroupController extends Controller
'active' => intval($request->input('active')) == 1,
];
$repository->updateRuleGroup($ruleGroup, $data);
$repository->update($ruleGroup, $data);
Session::flash('success', trans('firefly.updated_rule_group', ['title' => $ruleGroup->title]));
Preferences::mark();
@@ -143,7 +143,7 @@ class RuleGroupController extends Controller
{
$subTitle = trans('firefly.delete_rule_group', ['title' => $ruleGroup->title]);
$ruleGroupList = Expandedform::makeSelectList($repository->getRuleGroups(), true);
$ruleGroupList = Expandedform::makeSelectList($repository->get(), true);
unset($ruleGroupList[$ruleGroup->id]);
// put previous url in session
@@ -167,7 +167,7 @@ class RuleGroupController extends Controller
$title = $ruleGroup->title;
$moveTo = Auth::user()->ruleGroups()->find(intval(Input::get('move_rules_before_delete')));
$repository->destroyRuleGroup($ruleGroup, $moveTo);
$repository->destroy($ruleGroup, $moveTo);
Session::flash('success', trans('firefly.deleted_rule_group', ['title' => $title]));
@@ -186,7 +186,7 @@ class RuleGroupController extends Controller
*/
public function up(RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup)
{
$repository->moveRuleGroupUp($ruleGroup);
$repository->moveUp($ruleGroup);
return redirect(route('rules.index'));
@@ -200,7 +200,7 @@ class RuleGroupController extends Controller
*/
public function down(RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup)
{
$repository->moveRuleGroupDown($ruleGroup);
$repository->moveDown($ruleGroup);
return redirect(route('rules.index'));