mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-10-01 05:36:00 +00:00
Added ability to copy a role
- Copies via loading in model on create view. - Updated role views while editing to bring up to similar format as that used for more modern app areas. - Added tests to cover. Related to #1123
This commit is contained in:
parent
67b6c07548
commit
da01913616
@ -3,6 +3,7 @@
|
|||||||
namespace BookStack\Http\Controllers;
|
namespace BookStack\Http\Controllers;
|
||||||
|
|
||||||
use BookStack\Auth\Permissions\PermissionsRepo;
|
use BookStack\Auth\Permissions\PermissionsRepo;
|
||||||
|
use BookStack\Auth\Role;
|
||||||
use BookStack\Exceptions\PermissionsException;
|
use BookStack\Exceptions\PermissionsException;
|
||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
@ -34,11 +35,21 @@ class RoleController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Show the form to create a new role.
|
* Show the form to create a new role.
|
||||||
*/
|
*/
|
||||||
public function create()
|
public function create(Request $request)
|
||||||
{
|
{
|
||||||
$this->checkPermission('user-roles-manage');
|
$this->checkPermission('user-roles-manage');
|
||||||
|
|
||||||
return view('settings.roles.create');
|
/** @var ?Role $role */
|
||||||
|
$role = null;
|
||||||
|
if ($request->has('copy_from')) {
|
||||||
|
$role = Role::query()->find($request->get('copy_from'));
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($role) {
|
||||||
|
$role->display_name .= ' (' . trans('common.copy') . ')';
|
||||||
|
}
|
||||||
|
|
||||||
|
return view('settings.roles.create', ['role' => $role]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -49,7 +60,7 @@ class RoleController extends Controller
|
|||||||
$this->checkPermission('user-roles-manage');
|
$this->checkPermission('user-roles-manage');
|
||||||
$this->validate($request, [
|
$this->validate($request, [
|
||||||
'display_name' => ['required', 'min:3', 'max:180'],
|
'display_name' => ['required', 'min:3', 'max:180'],
|
||||||
'description' => 'max:180',
|
'description' => ['max:180'],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->permissionsRepo->saveNewRole($request->all());
|
$this->permissionsRepo->saveNewRole($request->all());
|
||||||
@ -84,7 +95,7 @@ class RoleController extends Controller
|
|||||||
$this->checkPermission('user-roles-manage');
|
$this->checkPermission('user-roles-manage');
|
||||||
$this->validate($request, [
|
$this->validate($request, [
|
||||||
'display_name' => ['required', 'min:3', 'max:180'],
|
'display_name' => ['required', 'min:3', 'max:180'],
|
||||||
'description' => 'max:180',
|
'description' => ['max:180'],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->permissionsRepo->updateRole($id, $request->all());
|
$this->permissionsRepo->updateRole($id, $request->all());
|
||||||
|
@ -8,9 +8,21 @@
|
|||||||
@include('settings.parts.navbar', ['selected' => 'roles'])
|
@include('settings.parts.navbar', ['selected' => 'roles'])
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="card content-wrap">
|
||||||
|
<h1 class="list-heading">{{ trans('settings.role_create') }}</h1>
|
||||||
|
|
||||||
<form action="{{ url("/settings/roles/new") }}" method="POST">
|
<form action="{{ url("/settings/roles/new") }}" method="POST">
|
||||||
@include('settings.roles.parts.form', ['title' => trans('settings.role_create')])
|
{{ csrf_field() }}
|
||||||
|
|
||||||
|
@include('settings.roles.parts.form', ['role' => $role ?? null])
|
||||||
|
|
||||||
|
<div class="form-group text-right">
|
||||||
|
<a href="{{ url("/settings/roles") }}" class="button outline">{{ trans('common.cancel') }}</a>
|
||||||
|
<button type="submit" class="button">{{ trans('settings.role_save') }}</button>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@stop
|
@stop
|
||||||
|
@ -7,10 +7,53 @@
|
|||||||
@include('settings.parts.navbar', ['selected' => 'roles'])
|
@include('settings.parts.navbar', ['selected' => 'roles'])
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="card content-wrap">
|
||||||
|
<h1 class="list-heading">{{ trans('settings.role_edit') }}</h1>
|
||||||
|
|
||||||
<form action="{{ url("/settings/roles/{$role->id}") }}" method="POST">
|
<form action="{{ url("/settings/roles/{$role->id}") }}" method="POST">
|
||||||
<input type="hidden" name="_method" value="PUT">
|
{{ csrf_field() }}
|
||||||
@include('settings.roles.parts.form', ['model' => $role, 'title' => trans('settings.role_edit'), 'icon' => 'edit'])
|
{{ method_field('PUT') }}
|
||||||
|
|
||||||
|
@include('settings.roles.parts.form', ['role' => $role])
|
||||||
|
|
||||||
|
<div class="form-group text-right">
|
||||||
|
<a href="{{ url("/settings/roles") }}" class="button outline">{{ trans('common.cancel') }}</a>
|
||||||
|
<a href="{{ url("/settings/roles/new?copy_from={$role->id}") }}" class="button outline">{{ trans('common.copy') }}</a>
|
||||||
|
<a href="{{ url("/settings/roles/delete/{$role->id}") }}" class="button outline">{{ trans('settings.role_delete') }}</a>
|
||||||
|
<button type="submit" class="button">{{ trans('settings.role_save') }}</button>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="card content-wrap auto-height">
|
||||||
|
<h2 class="list-heading">{{ trans('settings.role_users') }}</h2>
|
||||||
|
@if(count($role->users ?? []) > 0)
|
||||||
|
<div class="grid third">
|
||||||
|
@foreach($role->users as $user)
|
||||||
|
<div class="user-list-item">
|
||||||
|
<div>
|
||||||
|
<img class="avatar small" src="{{ $user->getAvatar(40) }}" alt="{{ $user->name }}">
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
@if(userCan('users-manage') || user()->id == $user->id)
|
||||||
|
<a href="{{ url("/settings/users/{$user->id}") }}">
|
||||||
|
@endif
|
||||||
|
{{ $user->name }}
|
||||||
|
@if(userCan('users-manage') || user()->id == $user->id)
|
||||||
|
</a>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endforeach
|
||||||
|
</div>
|
||||||
|
@else
|
||||||
|
<p class="text-muted">
|
||||||
|
{{ trans('settings.role_users_none') }}
|
||||||
|
</p>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@stop
|
@stop
|
||||||
|
@ -1,8 +1,3 @@
|
|||||||
{!! csrf_field() !!}
|
|
||||||
|
|
||||||
<div class="card content-wrap">
|
|
||||||
<h1 class="list-heading">{{ $title }}</h1>
|
|
||||||
|
|
||||||
<div class="setting-list">
|
<div class="setting-list">
|
||||||
|
|
||||||
<div class="grid half">
|
<div class="grid half">
|
||||||
@ -12,20 +7,20 @@
|
|||||||
<div>
|
<div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="display_name">{{ trans('settings.role_name') }}</label>
|
<label for="display_name">{{ trans('settings.role_name') }}</label>
|
||||||
@include('form.text', ['name' => 'display_name'])
|
@include('form.text', ['name' => 'display_name', 'model' => $role])
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="description">{{ trans('settings.role_desc') }}</label>
|
<label for="description">{{ trans('settings.role_desc') }}</label>
|
||||||
@include('form.text', ['name' => 'description'])
|
@include('form.text', ['name' => 'description', 'model' => $role])
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
@include('form.checkbox', ['name' => 'mfa_enforced', 'label' => trans('settings.role_mfa_enforced') ])
|
@include('form.checkbox', ['name' => 'mfa_enforced', 'label' => trans('settings.role_mfa_enforced'), 'model' => $role ])
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@if(in_array(config('auth.method'), ['ldap', 'saml2', 'oidc']))
|
@if(in_array(config('auth.method'), ['ldap', 'saml2', 'oidc']))
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="name">{{ trans('settings.role_external_auth_id') }}</label>
|
<label for="name">{{ trans('settings.role_external_auth_id') }}</label>
|
||||||
@include('form.text', ['name' => 'external_auth_id'])
|
@include('form.text', ['name' => 'external_auth_id', 'model' => $role])
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
@ -227,41 +222,3 @@
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group text-right">
|
|
||||||
<a href="{{ url("/settings/roles") }}" class="button outline">{{ trans('common.cancel') }}</a>
|
|
||||||
@if (isset($role) && $role->id)
|
|
||||||
<a href="{{ url("/settings/roles/delete/{$role->id}") }}" class="button outline">{{ trans('settings.role_delete') }}</a>
|
|
||||||
@endif
|
|
||||||
<button type="submit" class="button">{{ trans('settings.role_save') }}</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="card content-wrap auto-height">
|
|
||||||
<h2 class="list-heading">{{ trans('settings.role_users') }}</h2>
|
|
||||||
@if(count($role->users ?? []) > 0)
|
|
||||||
<div class="grid third">
|
|
||||||
@foreach($role->users as $user)
|
|
||||||
<div class="user-list-item">
|
|
||||||
<div>
|
|
||||||
<img class="avatar small" src="{{ $user->getAvatar(40) }}" alt="{{ $user->name }}">
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
@if(userCan('users-manage') || user()->id == $user->id)
|
|
||||||
<a href="{{ url("/settings/users/{$user->id}") }}">
|
|
||||||
@endif
|
|
||||||
{{ $user->name }}
|
|
||||||
@if(userCan('users-manage') || user()->id == $user->id)
|
|
||||||
</a>
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@endforeach
|
|
||||||
</div>
|
|
||||||
@else
|
|
||||||
<p class="text-muted">
|
|
||||||
{{ trans('settings.role_users_none') }}
|
|
||||||
</p>
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
|
@ -163,6 +163,23 @@ class RolesTest extends TestCase
|
|||||||
$this->assertEquals($this->user->id, $roleA->users()->first()->id);
|
$this->assertEquals($this->user->id, $roleA->users()->first()->id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_copy_role_button_shown()
|
||||||
|
{
|
||||||
|
/** @var Role $role */
|
||||||
|
$role = Role::query()->first();
|
||||||
|
$resp = $this->asAdmin()->get("/settings/roles/{$role->id}");
|
||||||
|
$resp->assertElementContains('a[href$="/roles/new?copy_from=' . $role->id . '"]', 'Copy');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_copy_from_param_on_create_prefills_with_other_role_data()
|
||||||
|
{
|
||||||
|
/** @var Role $role */
|
||||||
|
$role = Role::query()->first();
|
||||||
|
$resp = $this->asAdmin()->get("/settings/roles/new?copy_from={$role->id}");
|
||||||
|
$resp->assertOk();
|
||||||
|
$resp->assertElementExists('input[name="display_name"][value="' . ($role->display_name . ' (Copy)') . '"]');
|
||||||
|
}
|
||||||
|
|
||||||
public function test_manage_user_permission()
|
public function test_manage_user_permission()
|
||||||
{
|
{
|
||||||
$this->actingAs($this->user)->get('/settings/users')->assertRedirect('/');
|
$this->actingAs($this->user)->get('/settings/users')->assertRedirect('/');
|
||||||
|
Loading…
Reference in New Issue
Block a user