kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-24 04:41:01 +00:00
Code Issues Projects Releases Wiki Activity

Code to fix #4162

Browse Source
This commit is contained in:
James Cole
2020-12-18 19:16:56 +01:00
parent 21619544f5
commit dac961a732
4 changed files with 126 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,14 +198,13 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
}
/**
* @param User $user
*
* @return Collection
*/
public function getRuleGroupsWithRules(User $user): Collection
public function getRuleGroupsWithRules(): Collection
{
return $user->ruleGroups()
return $this->user->ruleGroups()
->orderBy('order', 'ASC')
->where('active', true)
->with(
[
'rules' => static function (HasMany $query) {

4
app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php
View File

@@ -102,11 +102,9 @@ interface RuleGroupRepositoryInterface
public function getHighestOrderRuleGroup(): int;
/**
* @param User $user
*
* @return Collection
*/
public function getRuleGroupsWithRules(User $user): Collection;
public function getRuleGroupsWithRules(): Collection;
/**
* @param RuleGroup $group