mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-12 15:35:15 +00:00
🤖 Auto commit for release 'develop' on 2025-08-16
This commit is contained in:
@@ -913,6 +913,4 @@ class ExportDataGenerator
|
||||
{
|
||||
$this->userGroup = $userGroup;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@@ -39,7 +39,7 @@ use Illuminate\Support\Facades\Log;
|
||||
trait ValidatesUserGroupTrait
|
||||
{
|
||||
protected ?UserGroup $userGroup = null;
|
||||
protected ?User $user = null;
|
||||
protected ?User $user = null;
|
||||
|
||||
/**
|
||||
* An "undocumented" filter
|
||||
@@ -102,7 +102,7 @@ trait ValidatesUserGroupTrait
|
||||
if ($user->hasRoleInGroupOrOwner($group, $role)) {
|
||||
Log::debug(sprintf('validateUserGroup: User has role "%s" in group #%d, return the group.', $role->value, $groupId));
|
||||
$this->userGroup = $group;
|
||||
$this->user = $user;
|
||||
$this->user = $user;
|
||||
|
||||
return $group;
|
||||
}
|
||||
|
@@ -73,6 +73,7 @@ trait UserGroupTrait
|
||||
return;
|
||||
}
|
||||
$class = null === $user ? 'NULL' : $user::class;
|
||||
|
||||
throw new FireflyException(sprintf('Object is %s, not User.', $class));
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user