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

More resources for rules.

Browse Source
This commit is contained in:
James Cole
2016-01-14 10:33:24 +01:00
parent 97770da619
commit b9b0413510
6 changed files with 54 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@
namespace FireflyIII\Http\Controllers;
use Auth;
use ExpandedForm;
use FireflyIII\Http\Requests;
use FireflyIII\Http\Requests\RuleGroupFormRequest;
use FireflyIII\Models\Rule;
@@ -146,16 +147,19 @@ class RuleController extends Controller
*
* @return \Illuminate\View\View
*/
public function deleteRuleGroup(RuleGroup $ruleGroup)
public function deleteRuleGroup(RuleRepositoryInterface $repository, RuleGroup $ruleGroup)
{
$subTitle = trans('firefly.delete_rule_group', ['title' => $ruleGroup->title]);
$ruleGroupList = Expandedform::makeSelectList($repository->getRuleGroups(), true);
unset($ruleGroupList[$ruleGroup->id]);
// put previous url in session
Session::put('rules.rule-group.delete.url', URL::previous());
Session::flash('gaEventCategory', 'rules');
Session::flash('gaEventAction', 'delete-rule-group');
return view('rules.rule-group.delete', compact('ruleGroup', 'subTitle'));
return view('rules.rule-group.delete', compact('ruleGroup', 'subTitle', 'ruleGroupList'));
}
/**
@@ -168,7 +172,9 @@ class RuleController extends Controller
{
$title = $ruleGroup->title;
$repository->destroyRuleGroup($ruleGroup);
$moveTo = Auth::user()->ruleGroups()->find(intval(Input::get('move_rules_before_delete')));
$repository->destroyRuleGroup($ruleGroup, $moveTo);
Session::flash('success', trans('firefly.deleted_rule_group', ['title' => $title]));