Skip to content

Firefly III: a personal finances manager

Fix #9640

James Cole2d96bd84b5cb
diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php
index 847162db5e..107042d458 100644
--- a/app/Http/Controllers/Rule/CreateController.php
+++ b/app/Http/Controllers/Rule/CreateController.php
@@ -270,6 +270,7 @@ class CreateController extends Controller
$data = $request->getRuleData();
$rule = $this->ruleRepos->store($data);
+ session()->flash('success_url', route('rules.select-transactions', [$rule->id]));
session()->flash('success', (string) trans('firefly.stored_new_rule', ['title' => $rule->title]));
app('preferences')->mark();
diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig
index 0c76e48cd9..62adc40fd3 100644
--- a/resources/views/rules/index.twig
+++ b/resources/views/rules/index.twig
@@ -6,12 +6,15 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
- <p>
+ <div class="btn-group">
<a href="{{ route('rule-groups.create') }}" id="new_rule_group" class="btn btn-success">{{ 'new_rule_group'|_ }}</a>
- </p>
+ <a href="{{ route('rules.create') }}" class="btn btn-success new_rule">{{ 'new_rule'|_ }}</a>
+ </div>
+ <p></p>
</div>
</div>
+
{% if ruleGroups|length == 1 and ruleGroups[0].rules.count() == 0 %}
{% include 'partials.empty' with {objectType: 'default', type: 'rules',route: route('rules.create')} %}
{# make FF ignore demo for now. #}
@@ -62,6 +65,10 @@
<p>
<em>{{ ruleGroup.description }}</em>
</p>
+ <p>
+ <a href="{{ route('rules.create', ruleGroup.id) }}"
+ class="btn btn-success new_rule">{{ 'new_rule'|_ }}</a>
+ </p>
{% if ruleGroup.rules.count() > 0 %}
<table class="table table-hover table-striped group-rules">