Зуев Егор / wiki.dev

Go to a project
Toggle navigation
Toggle navigation pinning
Dan Brown
33d4844f 1 parent 989de47f

Fixed role 'manage own permissions' permission

Inline Side-by-side
Showing 3 changed files with 4 additions and 4 deletions
...@@ -93,7 +93,7 @@ class PermissionsRepo ...@@ -93,7 +93,7 @@ class PermissionsRepo
93 $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : []; 93 $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
94 $this->assignRolePermissions($role, $permissions); 94 $this->assignRolePermissions($role, $permissions);
95 95
96 - if ($role->name === 'admin') { 96 + if ($role->system_name === 'admin') {
97 $permissions = $this->permission->all()->pluck('id')->toArray(); 97 $permissions = $this->permission->all()->pluck('id')->toArray();
98 $role->permissions()->sync($permissions); 98 $role->permissions()->sync($permissions);
99 } 99 }
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 <label>@include('settings/roles/checkbox', ['permission' => 'users-manage']) {{ trans('settings.role_manage_users') }}</label> 18 <label>@include('settings/roles/checkbox', ['permission' => 'users-manage']) {{ trans('settings.role_manage_users') }}</label>
19 <label>@include('settings/roles/checkbox', ['permission' => 'user-roles-manage']) {{ trans('settings.role_manage_roles') }}</label> 19 <label>@include('settings/roles/checkbox', ['permission' => 'user-roles-manage']) {{ trans('settings.role_manage_roles') }}</label>
20 <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-all']) {{ trans('settings.role_manage_entity_permissions') }}</label> 20 <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>
22 <label>@include('settings/roles/checkbox', ['permission' => 'settings-manage']) {{ trans('settings.role_manage_settings') }}</label> 22 <label>@include('settings/roles/checkbox', ['permission' => 'settings-manage']) {{ trans('settings.role_manage_settings') }}</label>
23 </div> 23 </div>
24 24
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <div class="row"> 8 <div class="row">
9 <div class="col-sm-12 faded"> 9 <div class="col-sm-12 faded">
10 <div class="breadcrumbs"> 10 <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>
12 </div> 12 </div>
13 </div> 13 </div>
14 </div> 14 </div>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 </div> 16 </div>
17 17
18 <div class="container small" ng-non-bindable> 18 <div class="container small" ng-non-bindable>
19 - <h1>Create User</h1> 19 + <h1>{{ trans('settings.users_add_new') }}</h1>
20 20
21 <form action="{{ baseUrl("/settings/users/create") }}" method="post"> 21 <form action="{{ baseUrl("/settings/users/create") }}" method="post">
22 {!! csrf_field() !!} 22 {!! csrf_field() !!}
......