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

Fix last minute issues.

Browse Source
This commit is contained in:
James Cole
2018-06-03 08:23:49 +02:00
parent b52bd59cea
commit c7af25ac38
3 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Repositories/Rule/RuleRepository.php
View File

@@ -98,7 +98,7 @@ class RuleRepository implements RuleRepositoryInterface
public function getForImport(): Collection
{
return Rule::distinct()
->where('rules.user_id', $this->user->user_id)
->where('rules.user_id', $this->user->id)
->leftJoin('rule_groups', 'rule_groups.id', '=', 'rules.rule_group_id')
->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')
->where('rule_groups.active', 1)