github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-07 19:34:33 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixed role 'manage own permissions' permission

Browse Source
This commit is contained in:
Dan Brown
2017-01-22 12:16:02 +00:00
parent 989de47f22
commit 33d4844f17
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Repos/PermissionsRepo.php
View File

@ -93,7 +93,7 @@ class PermissionsRepo
$permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : []; $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
$this->assignRolePermissions($role, $permissions); $this->assignRolePermissions($role, $permissions);
if ($role->name === 'admin') { if ($role->system_name === 'admin') {
$permissions = $this->permission->all()->pluck('id')->toArray(); $permissions = $this->permission->all()->pluck('id')->toArray();
$role->permissions()->sync($permissions); $role->permissions()->sync($permissions);
} }

2
resources/views/settings/roles/form.blade.php
View File

@ -18,7 +18,7 @@
<label>@include('settings/roles/checkbox', ['permission' => 'users-manage']) {{ trans('settings.role_manage_users') }}</label> <label>@include('settings/roles/checkbox', ['permission' => 'users-manage']) {{ trans('settings.role_manage_users') }}</label>
<label>@include('settings/roles/checkbox', ['permission' => 'user-roles-manage']) {{ trans('settings.role_manage_roles') }}</label> <label>@include('settings/roles/checkbox', ['permission' => 'user-roles-manage']) {{ trans('settings.role_manage_roles') }}</label>
<label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-all']) {{ trans('settings.role_manage_entity_permissions') }}</label> <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-all']) {{ trans('settings.role_manage_entity_permissions') }}</label>
<label>@include('settings/roles/checkbox', ['permission' => 'permissions']) {{ trans('settings.role_manage_own_entity_permissions') }}</label> <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-own']) {{ trans('settings.role_manage_own_entity_permissions') }}</label>
<label>@include('settings/roles/checkbox', ['permission' => 'settings-manage']) {{ trans('settings.role_manage_settings') }}</label> <label>@include('settings/roles/checkbox', ['permission' => 'settings-manage']) {{ trans('settings.role_manage_settings') }}</label>
</div> </div>

4
resources/views/users/create.blade.php
View File

@ -8,7 +8,7 @@
<div class="row"> <div class="row">
<div class="col-sm-12 faded"> <div class="col-sm-12 faded">
<div class="breadcrumbs"> <div class="breadcrumbs">
<a href="{{ baseUrl('/settings/users') }}" class="text-button"><i class="zmdi zmdi-accounts"></i>Users</a> <a href="{{ baseUrl('/settings/users') }}" class="text-button"><i class="zmdi zmdi-accounts"></i>{{ trans('settings.users') }}</a>
</div> </div>
</div> </div>
</div> </div>
@ -16,7 +16,7 @@
</div> </div>
<div class="container small" ng-non-bindable> <div class="container small" ng-non-bindable>
<h1>Create User</h1> <h1>{{ trans('settings.users_add_new') }}</h1>
<form action="{{ baseUrl("/settings/users/create") }}" method="post"> <form action="{{ baseUrl("/settings/users/create") }}" method="post">
{!! csrf_field() !!} {!! csrf_field() !!}