forge-joniko/ldc-supportweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
K Muller 2026-10-15 09:12:16 +02:00
commit 9a1a07307b
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Bo/UserController.php
View file

@ -73,8 +73,9 @@ class UserController extends Controller
public function store(StoreUserRequest $request): \Illuminate\Http\RedirectResponse
{
return DB::transaction(function () use ($request) {
$user = new User();
$user = User::query()->onlyTrashed()->where('email', $request->validated('email'))->first() ?? new User();
$user->fill($request->safe()->except('sites'));
$user->deleted_at = null;
if ($user->saveOrFail()) {
$user->sites()->attach(collect($request->validated('sites'))->pluck('id'));

6
app/Http/Requests/Bo/Users/StoreUserRequest.php
View file

@ -40,7 +40,11 @@ class StoreUserRequest extends FormRequest
{
return [
'name' => 'required|string|min:3|max:255',
'email' => 'email|required|unique:users,email',
'email' => [
'email',
'required',
Rule::unique('users', 'email')->whereNull('deleted_at')
],
'role' => [
'required',
Rule::in(collect(RoleEnum::cases())->pluck('value')->all()),