From 661d8a0f691acf33bed5c765c31009b28c23eaa2 Mon Sep 17 00:00:00 2001 From: frederikpyt <frederikpyt@gmail.com> Date: Mon, 27 Jul 2020 13:35:00 +0200 Subject: [PATCH] Fixed users and role implementation --- .../views/admin/users/edit.blade.php | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php index af0348c..4fc653d 100644 --- a/skolehjem/resources/views/admin/users/edit.blade.php +++ b/skolehjem/resources/views/admin/users/edit.blade.php @@ -20,19 +20,34 @@ <input type="text" name="name_last" id="name_last" value="{{ $user->name_last }}" required> <label for="email">Email:</label> <input type="email" name="email" id="email" value="{{ $user->email }}" required> - <label for="password1">Password:</label> - <input type="password" name="password" id="password1" value="" required> - <label for="password2">Confirm Password:</label> - <input type="password" id="password2" value="" required> + <label for="password1">Password: (Forblives blank, hvis password ikke skal ændres)</label> + <input type="password" name="password" id="password1" value=""> + <label for="password2">Confirm Password: (Forblives blank, hvis password ikke skal ændres)</label> + <input type="password" id="password2" value=""> <label for="tel">Telefon nr:</label> <input type="tel" name="phone" id="tel" value="{{ $user->phone }}" required> - <label for="role">Rolle:</label> + <label for="role">Rolle: (Brug ctrl og shift til at vælge flere)</label> <select name="roles[]" id="roles" class="mb-2" multiple="multiple" required> - <option disabled selected value> -- Vælg Rolle(r) -- </option> - <option value>Ingen Rolle</option> - @foreach($roles as $role) - <option value="{{ $role->name }}">{{ $role->name }}</option> - @endforeach + @if(count($user->roles) == 0) + <option disabled selected> -- Vælg Rolle(r) -- </option> + <option value>Ingen Rolle</option> + @foreach($roles as $role) + <option value="{{ $role->name }}">{{ $role->name }}</option> + @endforeach + @else + <option disabled> -- Vælg Rolle(r) -- </option> + <option value>Ingen Rolle</option> + @foreach($roles as $role) + {{ $selected = "" }} + @foreach($user->roles as $userRole) + @if($userRole->id == $role->id) + {{ $selected = "selected" }} + @endif + @endforeach + <option {{ $selected }} value="{{ $role->name }}">{{ $role->name }}</option> + @endforeach + @endif + </select> <input type="submit" class="btn btn-dark text-white" value="Rediger"> </form>