Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Зуев Егор
/
wiki.dev
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Authored by
Dan Brown
2017-01-22 12:16:02 +0000
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Commit
33d4844f17b9580a1577a398d20c249359ab53ec
33d4844f
1 parent
989de47f
Fixed role 'manage own permissions' permission
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
app/Repos/PermissionsRepo.php
resources/views/settings/roles/form.blade.php
resources/views/users/create.blade.php
app/Repos/PermissionsRepo.php
View file @
33d4844
...
...
@@ -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
);
}
...
...
resources/views/settings/roles/form.blade.php
View file @
33d4844
...
...
@@ -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>
...
...
resources/views/users/create.blade.php
View file @
33d4844
...
...
@@ -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() !!}
...
...
Please
register
or
sign in
to post a comment