IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-30 12:43:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop

Browse Source 
# By Robert Horlings
# Via James Cole (2) and Robert Horlings (1)
* 'develop' of https://github.com/JC5/firefly-iii:
  Bugfix for a bug when adding a tag in a rule
  Bugfix in redirect after creating a new rule
This commit is contained in:
James Cole 2016-02-24 14:49:42 +01:00
commit a2275ae111
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,7 +263,7 @@ class RuleController extends Controller
// set value so create routine will not overwrite URL:
Session::put('rules.rule.create.fromStore', true);
return redirect(route('rules.rule.create', [$request->input('what')]))->withInput();
return redirect(route('rules.rule.create', [$ruleGroup]))->withInput();
}
// redirect to previous URL.

2
app/Rules/Actions/AddTag.php
View File

@ -47,7 +47,7 @@ class AddTag implements ActionInterface
// journal has this tag maybe?
$tag = Tag::firstOrCreateEncrypted(['tag' => $this->action->action_value, 'user_id' => Auth::user()->id]);
$count = $journal->tags()->where('id', $tag->id)->count();
$count = $journal->tags()->where('tag_id', $tag->id)->count();
if ($count == 0) {
$journal->tags()->save($tag);
}