vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anders 2020-06-30 14:04:41 +02:00
parent 709be5ea87 ed9e6c9d6a
commit 8d7a684b93
5 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
skolehjem/app/Http/Controllers/UserController.php
View File

@ -178,6 +178,13 @@ class UserController extends Controller
/** @var User $user */
$user->update($data);
$user->roles()->detach();
$user->forgetCachedPermissions();
foreach ($request->roles as $role){
$user->assignRole($role);
}
$user->save();
// }

2
skolehjem/app/User.php
View File

@ -21,7 +21,7 @@ class User extends Authenticatable
* @var array
*/
protected $fillable = [
'name_first', "name_last", 'email', 'password', "phone", "roles"
'name_first', "name_last", 'email', 'password', "phone"
];
/**

6
skolehjem/resources/views/admin/users/create.blade.php
View File

@ -25,9 +25,9 @@
<input type="password" id="password2" placeholder="Bekræft Password" required>
<label for="tel">Telefon nr:</label>
<input type="tel" name="phone" id="tel" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required>
<label for="role">Rolle:</label>
<select name="role" id="role" class="mb-2" required>
<option disabled selected value> -- Vælg en Rolle -- </option>
<label for="roles">Rolle:</label>
<select name="roles[]" id="roles" class="mb-2" multiple="multiple" required>
<option disabled selected value> -- Vælg Rolle(r) -- </option>
@foreach($roles as $role)
<option value="{{ $role->name }}">{{ $role->name }}</option>
@endforeach

4
skolehjem/resources/views/admin/users/edit.blade.php
View File

@ -27,8 +27,8 @@
<label for="tel">Telefon nr:</label>
<input type="tel" name="phone" id="tel" value="{{ $user->phone }}" required>
<label for="role">Rolle:</label>
<select name="role" id="role" class="mb-2" required>
<option disabled selected value> -- Vælg en Rolle -- </option>
<select name="roles[]" id="roles" class="mb-2" multiple="multiple" required>
<option disabled selected value> -- Vælg Rolle(r) -- </option>
@foreach($roles as $role)
<option value="{{ $role->name }}">{{ $role->name }}</option>
@endforeach

12
skolehjem/resources/views/admin/users/index.blade.php
View File

@ -16,7 +16,7 @@
<th>Efternavn</th>
<th>Email</th>
<th>Tlf nr</th>
<th>Rolle</th>
<th>Rolle(r)</th>
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
@ -26,7 +26,15 @@
<td>{{ $user->name_last }}</td>
<td>{{ $user->email }}</td>
<td>{{ $user->phone }}</td>
<td>{{ $user->roles }}</td>
<td>
@for($i = 0; $i < count($user->roles); $i++)
@if(count($user->roles)-1 != $i)
{{$user->roles[$i]->name}},
@else
{{$user->roles[$i]->name}}
@endif
@endfor
</td>
<td><a href="{{ route("users.edit", [ "user" => $user->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><form method="post" action="{{ route("users.destroy", [ "user" => $user ]) }}" class="w-100 nostyle">
@csrf