mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-11-30 12:43:43 +08:00
5f1ee5fb0e
The 'name' field was really redundant and caused confusion in the codebase, since the 'Display' name is often used and we have a 'system_name' for the admin and public role. This fixes #2032, Where external auth group matching has confusing behaviour as matching was done against the display_name, if no external_auth field is set, but only roles with a match 'name' field would be considered. This also fixes and error where the role users migration, on role delete, would not actually fire due to mis-matching http body keys. Looks like this has been an issue from the start. Added some testing to cover. Fixes #2211. Also converted phpdoc to typehints in many areas of the reviewed code during the above.
17 lines
589 B
PHP
17 lines
589 B
PHP
|
|
<div class="toggle-switch-list dual-column-content">
|
|
@foreach($roles as $role)
|
|
<div>
|
|
@include('components.custom-checkbox', [
|
|
'name' => $name . '[' . strval($role->id) . ']',
|
|
'label' => $role->display_name,
|
|
'value' => $role->id,
|
|
'checked' => old($name . '.' . strval($role->id)) || (!old('name') && isset($model) && $model->hasRole($role->id))
|
|
])
|
|
</div>
|
|
@endforeach
|
|
</div>
|
|
|
|
@if($errors->has($name))
|
|
<div class="text-neg text-small">{{ $errors->first($name) }}</div>
|
|
@endif |