From f2928e3d7d6acddffc46b0f4a4ed1d6892a8efd2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 31 May 2018 20:34:49 +0200 Subject: [PATCH] Possible fix for #1453 --- app/Http/Controllers/RuleGroupController.php | 6 ++++++ app/Models/RuleGroup.php | 1 + 2 files changed, 7 insertions(+) diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index 3c65632544..360f73eb82 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -129,11 +129,17 @@ class RuleGroupController extends Controller { $subTitle = trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]); + $preFilled = [ + 'active' => $ruleGroup->active, + ]; + + // put previous url in session if not redirect from store (not "return_to_edit"). if (true !== session('rule-groups.edit.fromUpdate')) { $this->rememberPreviousUri('rule-groups.edit.uri'); } session()->forget('rule-groups.edit.fromUpdate'); + session()->flash('preFilled', $preFilled); return view('rules.rule-group.edit', compact('ruleGroup', 'subTitle')); } diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index f16c6079ae..cfe4ae2c35 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -30,6 +30,7 @@ use FireflyIII\Models\Rule; /** * Class RuleGroup. + * @property bool $active */ class RuleGroup extends Model {