mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-12-02 13:58:57 +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.
46 lines
1.7 KiB
PHP
46 lines
1.7 KiB
PHP
@extends('simple-layout')
|
|
|
|
@section('body')
|
|
<div class="container small">
|
|
|
|
<div class="py-m">
|
|
@include('settings.navbar', ['selected' => 'roles'])
|
|
</div>
|
|
|
|
<div class="card content-wrap auto-height">
|
|
<h1 class="list-heading"> {{ trans('settings.role_delete') }}</h1>
|
|
|
|
<p>{{ trans('settings.role_delete_confirm', ['roleName' => $role->display_name]) }}</p>
|
|
|
|
<form action="{{ url("/settings/roles/delete/{$role->id}") }}" method="POST">
|
|
{!! csrf_field() !!}
|
|
<input type="hidden" name="_method" value="DELETE">
|
|
|
|
@if($role->users->count() > 0)
|
|
<div class="form-group">
|
|
<p>{{ trans('settings.role_delete_users_assigned', ['userCount' => $role->users->count()]) }}</p>
|
|
@include('form.role-select', ['options' => $roles, 'name' => 'migrate_role_id'])
|
|
</div>
|
|
@endif
|
|
|
|
<div class="grid half v-center">
|
|
<div>
|
|
<p class="text-neg">
|
|
<strong>{{ trans('settings.role_delete_sure') }}</strong>
|
|
</p>
|
|
</div>
|
|
<div>
|
|
<div class="form-group text-right">
|
|
<a href="{{ url("/settings/roles/{$role->id}") }}" class="button outline">{{ trans('common.cancel') }}</a>
|
|
<button type="submit" class="button">{{ trans('common.confirm') }}</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
</form>
|
|
</div>
|
|
|
|
</div>
|
|
@stop
|