Fixed role 'manage own permissions' permission

diff --git a/app/Repos/PermissionsRepo.php b/app/Repos/PermissionsRepo.php
index e1c6d87b12f3551ea28f2f0b4001c3ae222329e3..aa58d1718cc6bd22775c08d31fabd862159e4731 100644 (file)
--- a/app/Repos/PermissionsRepo.php
+++ b/app/Repos/PermissionsRepo.php
@@ -93,7 +93,7 @@ class PermissionsRepo
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         $this->assignRolePermissions($role, $permissions);
 
-        if ($role->name === 'admin') {
+        if ($role->system_name === 'admin') {
             $permissions = $this->permission->all()->pluck('id')->toArray();
             $role->permissions()->sync($permissions);
         }

diff --git a/resources/views/settings/roles/form.blade.php b/resources/views/settings/roles/form.blade.php
index 319f3a2df9dea8bed1310a5d0e7b3db9847c8d13..71b8f551fc97b22a083a82639421cae9fa53966a 100644 (file)
--- a/resources/views/settings/roles/form.blade.php
+++ b/resources/views/settings/roles/form.blade.php
@@ -18,7 +18,7 @@
                 <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' => '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>
             </div>
 

diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
index bff79820a664ede3b7f5fb3e51a0a19d1500f58f..de3a3151fab189d612d59742a8a9c62092eb0dfa 100644 (file)
--- a/resources/views/users/create.blade.php
+++ b/resources/views/users/create.blade.php
@@ -8,7 +8,7 @@
             <div class="row">
                 <div class="col-sm-12 faded">
                     <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>
@@ -16,7 +16,7 @@
     </div>
 
     <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">
             {!! csrf_field() !!}