kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-03 12:45:20 +00:00
Code Issues Projects Releases Wiki Activity

Fix user management for groups.

Browse Source
This commit is contained in:
James Cole
2020-06-20 10:22:07 +02:00
parent 5b29e78c4b
commit c036c5a2bc
5 changed files with 64 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Repositories/ObjectGroup/CreatesObjectGroups.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace FireflyIII\Repositories\ObjectGroup;
use FireflyIII\Models\ObjectGroup;
use FireflyIII\User;
/**
* Trait CreatesObjectGroups
@@ -17,10 +18,12 @@ trait CreatesObjectGroups
*/
protected function findObjectGroup(string $title): ?ObjectGroup
{
return ObjectGroup::where('title', $title)->first();
return $this->user->objectGroups()->where('title', $title)->first();
}
/**
* @param User $user
* @param string $title
*
* @return ObjectGroup|null
@@ -32,8 +35,9 @@ trait CreatesObjectGroups
if (!$this->hasObjectGroup($title)) {
return ObjectGroup::create(
[
'title' => $title,
'order' => $maxOrder + 1,
'user_id' => $this->user->id,
'title' => $title,
'order' => $maxOrder + 1,
]
);
}
@@ -46,7 +50,7 @@ trait CreatesObjectGroups
*/
protected function getObjectGroupMaxOrder(): int
{
return (int) ObjectGroup::max('order');
return (int) $this->user->objectGroups()->max('order');
}
/**
@@ -56,6 +60,6 @@ trait CreatesObjectGroups
*/
protected function hasObjectGroup(string $title): bool
{
return 1 === ObjectGroup::where('title', $title)->count();
return 1 === $this->user->objectGroups()->where('title', $title)->count();
}
}