mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-12 23:45:10 +00:00
chore: code cleanup.
This commit is contained in:
@@ -34,8 +34,8 @@ use Illuminate\Contracts\Auth\Authenticatable;
|
||||
*/
|
||||
trait AdministrationTrait
|
||||
{
|
||||
protected User $user;
|
||||
protected ?int $administrationId = null;
|
||||
protected User $user;
|
||||
protected ?UserGroup $userGroup = null;
|
||||
|
||||
/**
|
||||
@@ -56,6 +56,13 @@ trait AdministrationTrait
|
||||
$this->refreshAdministration();
|
||||
}
|
||||
|
||||
public function setUser(Authenticatable|User|null $user): void
|
||||
{
|
||||
if (null !== $user) {
|
||||
$this->user = $user;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return void
|
||||
*/
|
||||
@@ -63,8 +70,8 @@ trait AdministrationTrait
|
||||
{
|
||||
if (null !== $this->administrationId) {
|
||||
$memberships = GroupMembership::where('user_id', $this->user->id)
|
||||
->where('user_group_id', $this->administrationId)
|
||||
->count();
|
||||
->where('user_group_id', $this->administrationId)
|
||||
->count();
|
||||
if (0 === $memberships) {
|
||||
throw new FireflyException(sprintf('User #%d has no access to administration #%d', $this->user->id, $this->administrationId));
|
||||
}
|
||||
@@ -73,12 +80,4 @@ trait AdministrationTrait
|
||||
}
|
||||
throw new FireflyException(sprintf('Cannot validate administration for user #%d', $this->user->id));
|
||||
}
|
||||
|
||||
|
||||
public function setUser(Authenticatable|User|null $user): void
|
||||
{
|
||||
if (null !== $user) {
|
||||
$this->user = $user;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user