Skip to content

Commit 33d4844

Browse files
committed
Fixed role 'manage own permissions' permission
1 parent 989de47 commit 33d4844

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

app/Repos/PermissionsRepo.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function updateRole($roleId, $roleData)
9393
$permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
9494
$this->assignRolePermissions($role, $permissions);
9595

96-
if ($role->name === 'admin') {
96+
if ($role->system_name === 'admin') {
9797
$permissions = $this->permission->all()->pluck('id')->toArray();
9898
$role->permissions()->sync($permissions);
9999
}

resources/views/settings/roles/form.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<label>@include('settings/roles/checkbox', ['permission' => 'users-manage']) {{ trans('settings.role_manage_users') }}</label>
1919
<label>@include('settings/roles/checkbox', ['permission' => 'user-roles-manage']) {{ trans('settings.role_manage_roles') }}</label>
2020
<label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-all']) {{ trans('settings.role_manage_entity_permissions') }}</label>
21-
<label>@include('settings/roles/checkbox', ['permission' => 'permissions']) {{ trans('settings.role_manage_own_entity_permissions') }}</label>
21+
<label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-own']) {{ trans('settings.role_manage_own_entity_permissions') }}</label>
2222
<label>@include('settings/roles/checkbox', ['permission' => 'settings-manage']) {{ trans('settings.role_manage_settings') }}</label>
2323
</div>
2424

resources/views/users/create.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
<div class="row">
99
<div class="col-sm-12 faded">
1010
<div class="breadcrumbs">
11-
<a href="{{ baseUrl('/settings/users') }}" class="text-button"><i class="zmdi zmdi-accounts"></i>Users</a>
11+
<a href="{{ baseUrl('/settings/users') }}" class="text-button"><i class="zmdi zmdi-accounts"></i>{{ trans('settings.users') }}</a>
1212
</div>
1313
</div>
1414
</div>
1515
</div>
1616
</div>
1717

1818
<div class="container small" ng-non-bindable>
19-
<h1>Create User</h1>
19+
<h1>{{ trans('settings.users_add_new') }}</h1>
2020

2121
<form action="{{ baseUrl("/settings/users/create") }}" method="post">
2222
{!! csrf_field() !!}

0 commit comments

Comments
 (0)