minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FEATURE #2048: prepare routes for ACL, add some more permissions

Browse Source
This commit is contained in:
Michal Kváček
2017-08-11 02:07:31 +02:00
parent cccdbda543
commit 335ec4a167
41 changed files with 836 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/admin/userManagement/detail.blade.php
+29 -9
View File
@@ -32,12 +32,24 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#user-edit" role="tab" id="user-edit-tab"
aria-controls="user-edit">
@lang('admin/userManagement.edit')
</a>
</li>
@can('update', $user)
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#user-edit" role="tab" id="user-edit-tab"
aria-controls="user-edit">
@lang('admin/userManagement.edit')
</a>
</li>
@endcan
@can('set-permissions', $user)
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#user-permissions" role="tab"
id="user-permissions-tab"
aria-controls="user-edit">
@lang('admin/userManagement.permissions')
</a>
</li>
@endcan
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#user-actions" role="tab" id="user-actions-tab"
@@ -60,9 +72,17 @@
</div>
<div class="tab-pane" id="user-edit" role="tabpanel">
@include('admin.userManagement.editForm', ['states' => $statuses])
</div>
@can('update', $user)
<div class="tab-pane" id="user-edit" role="tabpanel">
@include('admin.userManagement.editForm', ['states' => $statuses])
</div>
@endcan
@can('set-permissions', $user)
<div class="tab-pane" id="user-permissions" role="tabpanel">
@include('admin.userManagement.permissions.form')
</div>
@endcan
<div class="tab-pane" id="user-actions" role="tabpanel">
@if (!empty($actions))
resources/views/admin/userManagement/editForm.blade.php
+7 -4
View File
@@ -29,8 +29,9 @@
name="password"
value="">
@if (\Auth::user()->role == \App\Models\User::ROLE_ADMIN && \Auth::user()->id != $user->id)
<div class="row">
<div class="row">
@can('change-role', $user)
<div class="col-lg-6">
<label class="label-control">
@@ -43,7 +44,9 @@
@endforeach
</select>
</div>
@endcan
@can('change-status', $user)
<div class="col-lg-6">
<label class="label-control">
@lang('admin/userManagement.status')
@@ -55,8 +58,8 @@
@endforeach
</select>
</div>
</div>
@endif
@endcan
</div>
<button type="submit" class="btn btn-primary">@lang('admin/userManagement.update')</button>
</form>
resources/views/admin/userManagement/permissions/form.blade.php
+34
View File
@@ -0,0 +1,34 @@
<form action="{{route('permissions.update', ['user' => $user])}}" method="post">
{!! csrf_field() !!}
@foreach($permissions as $permission)
<div>
<label>
<input class="checkbox" data-id="{{$permission->id}}" value="1"
@if($user->hasAbility($permission->string_id))
checked
@endif name="permissions[{{$permission->string_id}}]" type="checkbox">
<span>{{trans($permission->name)}}</span>
</label>
</div>
@if($permission->subpermissions->count() > 0)
@foreach($permission->subpermissions as $subpermission)
<div>
<label>
<i class="fa fa-fw"></i>
<input class="checkbox child-{{$subpermission->parent_id}}" value="1"
@if($user->hasAbility($permission->string_id) && $user->hasAbility($subpermission->string_id))
checked
@endif name="permissions[{{$subpermission->string_id}}]" type="checkbox">
<span>{{trans($subpermission->name)}}</span>
</label>
</div>
@endforeach
@endif
@endforeach
<button class="btn btn-primary">Ulozit</button>
</form>