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

Possible fix for #1453

Browse Source
This commit is contained in:
James Cole
2018-05-31 20:34:49 +02:00
parent 895ab9c5d8
commit f2928e3d7d
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,11 +129,17 @@ class RuleGroupController extends Controller
{ {
$subTitle = trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]); $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"). // put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('rule-groups.edit.fromUpdate')) { if (true !== session('rule-groups.edit.fromUpdate')) {
$this->rememberPreviousUri('rule-groups.edit.uri'); $this->rememberPreviousUri('rule-groups.edit.uri');
} }
session()->forget('rule-groups.edit.fromUpdate'); session()->forget('rule-groups.edit.fromUpdate');
session()->flash('preFilled', $preFilled);
return view('rules.rule-group.edit', compact('ruleGroup', 'subTitle')); return view('rules.rule-group.edit', compact('ruleGroup', 'subTitle'));
} }

1
app/Models/RuleGroup.php
View File

@@ -30,6 +30,7 @@ use FireflyIII\Models\Rule;
/** /**
* Class RuleGroup. * Class RuleGroup.
* @property bool $active
*/ */
class RuleGroup extends Model class RuleGroup extends Model
{ {