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

Merge branch 'hotfix/3.7.2.1'

Browse Source
This commit is contained in:
James Cole
2016-02-05 13:16:21 +01:00
parent 10a2a4cf5b 9b10984d81
commit 4b4384b1a8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -341,6 +341,7 @@ class RuleController extends Controller
$data = [ $data = [
'rule_group_id' => $repository->getFirstRuleGroup()->id, 'rule_group_id' => $repository->getFirstRuleGroup()->id,
'stop_processing' => 0, 'stop_processing' => 0,
'user_id' => Auth::user()->id,
'title' => trans('firefly.default_rule_name'), 'title' => trans('firefly.default_rule_name'),
'description' => trans('firefly.default_rule_description'), 'description' => trans('firefly.default_rule_description'),
'trigger' => 'store-journal', 'trigger' => 'store-journal',
@@ -373,7 +374,7 @@ class RuleController extends Controller
if ($repository->count() === 0) { if ($repository->count() === 0) {
$data = [ $data = [
'user' => Auth::user()->id, 'user_id' => Auth::user()->id,
'title' => trans('firefly.default_rule_group_name'), 'title' => trans('firefly.default_rule_group_name'),
'description' => trans('firefly.default_rule_group_description'), 'description' => trans('firefly.default_rule_group_description'),
]; ];

2
app/Repositories/RuleGroup/RuleGroupRepository.php
View File

@@ -170,7 +170,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
$newRuleGroup = new RuleGroup( $newRuleGroup = new RuleGroup(
[ [
'user_id' => $data['user'], 'user_id' => $data['user_id'],
'title' => $data['title'], 'title' => $data['title'],
'description' => $data['description'], 'description' => $data['description'],
'order' => ($order + 1), 'order' => ($order + 1),