removed prefix from permission title
This commit is contained in:
parent
4c959bc91c
commit
551c27c3d7
@ -32,9 +32,9 @@ class Roles extends Controller
|
|||||||
public function create()
|
public function create()
|
||||||
{
|
{
|
||||||
$names = $permissions = [];
|
$names = $permissions = [];
|
||||||
$allPermissions = Permission::all();
|
$all_permissions = Permission::all();
|
||||||
|
|
||||||
foreach ($allPermissions as $permission) {
|
foreach ($all_permissions as $permission) {
|
||||||
// permission code explode - and get permission type
|
// permission code explode - and get permission type
|
||||||
$n = explode('-', $permission->name);
|
$n = explode('-', $permission->name);
|
||||||
|
|
||||||
@ -85,13 +85,10 @@ class Roles extends Controller
|
|||||||
*/
|
*/
|
||||||
public function edit(Role $role)
|
public function edit(Role $role)
|
||||||
{
|
{
|
||||||
//$permissions = Permission::all()->sortBy('display_name');
|
|
||||||
$names = $permissions = [];
|
$names = $permissions = [];
|
||||||
$allPermissions = Permission::all();
|
$all_permissions = Permission::all();
|
||||||
|
|
||||||
$rolePermissions = $role->permissions->pluck('id', 'id')->toArray();
|
foreach ($all_permissions as $permission) {
|
||||||
|
|
||||||
foreach ($allPermissions as $permission) {
|
|
||||||
// permission code explode - and get permission type
|
// permission code explode - and get permission type
|
||||||
$n = explode('-', $permission->name);
|
$n = explode('-', $permission->name);
|
||||||
|
|
||||||
@ -102,7 +99,7 @@ class Roles extends Controller
|
|||||||
$permissions[$n[0]][] = $permission;
|
$permissions[$n[0]][] = $permission;
|
||||||
}
|
}
|
||||||
|
|
||||||
return view('auth.roles.edit', compact('role', 'names', 'permissions', 'rolePermissions'));
|
return view('auth.roles.edit', compact('role', 'names', 'permissions'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -13,6 +13,13 @@ class Permission extends LaratrustPermission
|
|||||||
|
|
||||||
protected $table = 'permissions';
|
protected $table = 'permissions';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The accessors to append to the model's array form.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
protected $appends = ['title'];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The attributes that are mass assignable.
|
* The attributes that are mass assignable.
|
||||||
*
|
*
|
||||||
@ -37,4 +44,24 @@ class Permission extends LaratrustPermission
|
|||||||
|
|
||||||
return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
|
return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the name including rate.
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function getTitleAttribute()
|
||||||
|
{
|
||||||
|
$replaces = [
|
||||||
|
'Create ' => '',
|
||||||
|
'Read ' => '',
|
||||||
|
'Update ' => '',
|
||||||
|
'Delete ' => '',
|
||||||
|
'Modules' => 'Apps',
|
||||||
|
];
|
||||||
|
|
||||||
|
$title = str_replace(array_keys($replaces), array_values($replaces), $this->display_name);
|
||||||
|
|
||||||
|
return $title;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,6 @@ use App\Abstracts\Model;
|
|||||||
|
|
||||||
class Tax extends Model
|
class Tax extends Model
|
||||||
{
|
{
|
||||||
|
|
||||||
protected $table = 'taxes';
|
protected $table = 'taxes';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -34,8 +34,9 @@
|
|||||||
<div class="nav-wrapper">
|
<div class="nav-wrapper">
|
||||||
<ul class="nav nav-pills nav-fill flex-column flex-md-row" id="tabs-icons-text" role="tablist">
|
<ul class="nav nav-pills nav-fill flex-column flex-md-row" id="tabs-icons-text" role="tablist">
|
||||||
@foreach($names as $name)
|
@foreach($names as $name)
|
||||||
|
@php $active_tab_name = ($name == 'read') ? 'active' : ''; @endphp
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link mb-sm-3 mb-md-0 @php echo ($name == 'read') ? 'active' : ''; @endphp" id="tabs-icons-text-1-tab" data-toggle="tab" href="#tab-{{ $name }}" role="tab" aria-controls="tabs-icons-text-1" aria-selected="true">{{ ucwords($name) }}</a>
|
<a class="nav-link mb-sm-3 mb-md-0 {{ $active_tab_name }}" id="tabs-icons-text-1-tab" data-toggle="tab" href="#tab-{{ $name }}" role="tab" aria-controls="tabs-icons-text-1" aria-selected="true">{{ ucwords($name) }}</a>
|
||||||
</li>
|
</li>
|
||||||
@endforeach
|
@endforeach
|
||||||
</ul>
|
</ul>
|
||||||
@ -45,7 +46,8 @@
|
|||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="tab-content">
|
<div class="tab-content">
|
||||||
@foreach($permissions as $code => $code_permissions)
|
@foreach($permissions as $code => $code_permissions)
|
||||||
<div class="tab-pane fade show @php echo ($code == 'read') ? 'active' : ''; @endphp" id="tab-{{ $code }}" role="tabpanel">
|
@php $active_tab_code = ($code == 'read') ? 'active' : ''; @endphp
|
||||||
|
<div class="tab-pane fade show {{ $active_tab_code }}" id="tab-{{ $code }}" role="tabpanel">
|
||||||
<span class="btn btn-primary btn-sm" @click="select('{{ $code }}')">{{ trans('general.select_all') }}</span>
|
<span class="btn btn-primary btn-sm" @click="select('{{ $code }}')">{{ trans('general.select_all') }}</span>
|
||||||
<span class="btn btn-primary btn-sm" @click="unselect('{{ $code }}')">{{ trans('general.unselect_all') }}</span>
|
<span class="btn btn-primary btn-sm" @click="unselect('{{ $code }}')">{{ trans('general.unselect_all') }}</span>
|
||||||
|
|
||||||
@ -57,7 +59,7 @@
|
|||||||
<div class="custom-control custom-checkbox">
|
<div class="custom-control custom-checkbox">
|
||||||
{{ Form::checkbox('permissions', $item->id, null, ['id' => 'permissions-' . $item->id, 'class' => 'custom-control-input', 'v-model' => 'form.permissions']) }}
|
{{ Form::checkbox('permissions', $item->id, null, ['id' => 'permissions-' . $item->id, 'class' => 'custom-control-input', 'v-model' => 'form.permissions']) }}
|
||||||
<label class="custom-control-label" for="permissions-{{ $item->id }}">
|
<label class="custom-control-label" for="permissions-{{ $item->id }}">
|
||||||
{{ $item->display_name }}
|
{{ $item->title }}
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -35,8 +35,9 @@
|
|||||||
<div class="nav-wrapper">
|
<div class="nav-wrapper">
|
||||||
<ul class="nav nav-pills nav-fill flex-column flex-md-row" id="tabs-icons-text" role="tablist">
|
<ul class="nav nav-pills nav-fill flex-column flex-md-row" id="tabs-icons-text" role="tablist">
|
||||||
@foreach($names as $name)
|
@foreach($names as $name)
|
||||||
|
@php $active_tab_name = ($name == 'read') ? 'active' : ''; @endphp
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link mb-sm-3 mb-md-0 @php echo ($name == 'read') ? 'active' : ''; @endphp" id="tabs-icons-text-1-tab" data-toggle="tab" href="#tab-{{ $name }}" role="tab" aria-controls="tabs-icons-text-1" aria-selected="true">{{ ucwords($name) }}</a>
|
<a class="nav-link mb-sm-3 mb-md-0 {{ $active_tab_name }}" id="tabs-icons-text-1-tab" data-toggle="tab" href="#tab-{{ $name }}" role="tab" aria-controls="tabs-icons-text-1" aria-selected="true">{{ ucwords($name) }}</a>
|
||||||
</li>
|
</li>
|
||||||
@endforeach
|
@endforeach
|
||||||
</ul>
|
</ul>
|
||||||
@ -46,7 +47,8 @@
|
|||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="tab-content" id="myTabContent">
|
<div class="tab-content" id="myTabContent">
|
||||||
@foreach($permissions as $code => $code_permissions)
|
@foreach($permissions as $code => $code_permissions)
|
||||||
<div class="tab-pane fade show @php echo ($code == 'read') ? 'active' : ''; @endphp" id="tab-{{ $code }}" role="tabpanel" aria-labelledby="tabs-icons-text-1-tab">
|
@php $active_tab_code = ($code == 'read') ? 'active' : ''; @endphp
|
||||||
|
<div class="tab-pane fade show {{ $active_tab_code }}" id="tab-{{ $code }}" role="tabpanel" aria-labelledby="tabs-icons-text-1-tab">
|
||||||
<span class="btn btn-primary btn-sm" @click="select('{{ $code }}')">{{trans('general.select_all')}}</span>
|
<span class="btn btn-primary btn-sm" @click="select('{{ $code }}')">{{trans('general.select_all')}}</span>
|
||||||
<span class="btn btn-primary btn-sm" @click="unselect('{{ $code }}')">{{trans('general.unselect_all')}}</span>
|
<span class="btn btn-primary btn-sm" @click="unselect('{{ $code }}')">{{trans('general.unselect_all')}}</span>
|
||||||
|
|
||||||
@ -58,7 +60,7 @@
|
|||||||
<div class="custom-control custom-checkbox">
|
<div class="custom-control custom-checkbox">
|
||||||
{{ Form::checkbox('permissions', $item->id, null, ['id' => 'permissions-' . $item->id, 'class' => 'custom-control-input', 'v-model' => 'form.permissions']) }}
|
{{ Form::checkbox('permissions', $item->id, null, ['id' => 'permissions-' . $item->id, 'class' => 'custom-control-input', 'v-model' => 'form.permissions']) }}
|
||||||
<label class="custom-control-label" for="permissions-{{ $item->id }}">
|
<label class="custom-control-label" for="permissions-{{ $item->id }}">
|
||||||
{{ $item->display_name }}
|
{{ $item->title }}
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user