mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-26 20:22:18 +00:00
Standardised admin role check
This commit is contained in:
parent
3eb2246291
commit
0c1b1cd435
@ -39,11 +39,11 @@ class DeleteUsers extends Command{
|
||||
$numDeleted = 0;
|
||||
if (strtolower(trim($confirm)) === 'yes')
|
||||
{
|
||||
$totalUsers = User::count();
|
||||
$totalUsers = $this->user->count();
|
||||
$users = $this->user->where('system_name', '=', null)->with('roles')->get();
|
||||
foreach ($users as $user)
|
||||
{
|
||||
if ($user->hasRole('admin'))
|
||||
if ($user->hasSystemRole('admin'))
|
||||
{
|
||||
// don't delete users with "admin" role
|
||||
continue;
|
||||
|
@ -115,9 +115,9 @@ class UserRepo
|
||||
*/
|
||||
public function isOnlyAdmin(User $user)
|
||||
{
|
||||
if (!$user->roles->pluck('name')->contains('admin')) return false;
|
||||
if (!$user->hasSystemRole('admin')) return false;
|
||||
|
||||
$adminRole = $this->role->getRole('admin');
|
||||
$adminRole = $this->role->getSystemRole('admin');
|
||||
if ($adminRole->users->count() > 1) return false;
|
||||
return true;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user