kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-06 12:45:30 +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

27
app/Repositories/ObjectGroup/ObjectGroupRepository.php
View File

@@ -5,6 +5,7 @@ namespace FireflyIII\Repositories\ObjectGroup;
use DB;
use FireflyIII\Models\ObjectGroup;
use FireflyIII\User;
use Illuminate\Support\Collection;
use Log;
@@ -13,12 +14,25 @@ use Log;
*/
class ObjectGroupRepository implements ObjectGroupRepositoryInterface
{
/** @var User */
private $user;
/**
* Constructor.
*/
public function __construct()
{
if ('testing' === config('app.env')) {
Log::warning(sprintf('%s should not be instantiated in the TEST environment!', get_class($this)));
}
}
/**
* @inheritDoc
*/
public function get(): Collection
{
return ObjectGroup::orderBy('order', 'ASC')->orderBy('title', 'ASC')->get();
return $this->user->objectGroups()->orderBy('order', 'ASC')->orderBy('title', 'ASC')->get();
}
/**
@@ -28,7 +42,7 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface
*/
public function search(string $query): Collection
{
$dbQuery = ObjectGroup::orderBy('order', 'ASC')->orderBy('title', 'ASC');
$dbQuery = $this->user->objectGroups()->orderBy('order', 'ASC')->orderBy('title', 'ASC');
if ('' !== $query) {
// split query on spaces just in case:
$parts = explode(' ', $query);
@@ -105,4 +119,13 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface
{
$objectGroup->delete();
}
/**
* @param User $user
*/
public function setUser(User $user): void
{
$this->user = $user;
}
}