This commit is contained in:
2025-11-04 00:23:41 +05:00
parent 1f31b020e8
commit 84c4a584a0
4 changed files with 9 additions and 5 deletions

View File

@@ -49,16 +49,14 @@ class UserForm
->relationship('roles', 'name') ->relationship('roles', 'name')
->multiple() ->multiple()
->preload() ->preload()
->native(false) ->native(false),
->required(),
Select::make('branches') Select::make('branches')
->label(__('Branches')) ->label(__('Branches'))
->relationship('branches', 'name', fn (Builder $query) => $query->distinct('id')->orderBy('id')) ->relationship('branches', 'name', fn (Builder $query) => $query->distinct('id')->orderBy('id'))
->multiple() ->multiple()
->preload() ->preload()
->native(false) ->native(false),
->required(),
]); ]);
} }
} }

View File

@@ -159,6 +159,10 @@ class LoginController extends Controller
$request->session()->put('auth.password_confirmed_at', time()); $request->session()->put('auth.password_confirmed_at', time());
} }
if ($user->roles->count() == 0) {
$user->assignRole('client');
}
return $this->sendLoginResponse($request); return $this->sendLoginResponse($request);
} }

View File

@@ -110,6 +110,8 @@ class RegisterController extends Controller
'must_fill_profile' => true, 'must_fill_profile' => true,
]); ]);
$user->assignRole('client');
return $user; return $user;
} }

View File

@@ -57,6 +57,6 @@ trait RoleCheckers
*/ */
public function isSystemUser(): bool public function isSystemUser(): bool
{ {
return $this->roles->count() > 0; return $this->hasAnyRole();
} }
} }