Auto commit for release 'develop' on 2024-04-02

This commit is contained in:
github-actions
2024-04-02 07:47:24 +02:00
parent 9e5faf919f
commit 746f1fd300
86 changed files with 84794 additions and 84469 deletions

View File

@@ -24,12 +24,9 @@ declare(strict_types=1);
namespace FireflyIII\Rules;
use FireflyIII\Models\TransactionType;
use FireflyIII\Models\UserGroup;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
use FireflyIII\User;
use FireflyIII\Validation\AccountValidator;
use Illuminate\Contracts\Validation\ValidationRule;
/**
@@ -38,8 +35,10 @@ use Illuminate\Contracts\Validation\ValidationRule;
class IsDefaultUserGroupName implements ValidationRule
{
private UserGroup $userGroup;
public function __construct(UserGroup $userGroup) {
$this->userGroup =$userGroup;
public function __construct(UserGroup $userGroup)
{
$this->userGroup = $userGroup;
}
/**
@@ -51,12 +50,13 @@ class IsDefaultUserGroupName implements ValidationRule
// are you owner of this group and the name is the same? fail.
/** @var User $user */
$user = auth()->user();
$user = auth()->user();
/** @var UserRepositoryInterface $userRepos */
$userRepos = app(UserRepositoryInterface::class);
$roles = $userRepos->getRolesInGroup($user, $this->userGroup->id);
if($this->userGroup->title === $user->email && in_array('owner', $roles, true)) {
$roles = $userRepos->getRolesInGroup($user, $this->userGroup->id);
if ($this->userGroup->title === $user->email && in_array('owner', $roles, true)) {
$fail('validation.administration_owner_rename')->translate();
}
}