shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sort role permissions by title

Browse Source
This commit is contained in:
denisdulici
2020-02-14 15:08:16 +03:00
parent 396b8635ca
commit 6d207b6106
5 changed files with 79 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Http/Controllers/Auth/Roles.php
View File

@ -31,21 +31,14 @@ class Roles extends Controller
*/
public function create()
{
$names = $permissions = [];
$all_permissions = Permission::all();
$permissions = [];
$actions = ['read', 'create', 'update', 'delete'];
foreach ($all_permissions as $permission) {
// permission code explode - and get permission type
$n = explode('-', $permission->name);
if (!in_array($n[0], $names)) {
$names[] = $n[0];
}
$permissions[$n[0]][] = $permission;
foreach ($actions as $action) {
$permissions[$action] = Permission::action($action)->get()->sortBy('title')->all();
}
return view('auth.roles.create', compact('names', 'permissions'));
return view('auth.roles.create', compact('actions', 'permissions'));
}
/**
@ -85,21 +78,14 @@ class Roles extends Controller
*/
public function edit(Role $role)
{
$names = $permissions = [];
$all_permissions = Permission::all();
$permissions = [];
$actions = ['read', 'create', 'update', 'delete'];
foreach ($all_permissions as $permission) {
// permission code explode - and get permission type
$n = explode('-', $permission->name);
if (!in_array($n[0], $names)) {
$names[] = $n[0];
}
$permissions[$n[0]][] = $permission;
foreach ($actions as $action) {
$permissions[$action] = Permission::action($action)->get()->sortBy('title')->all();
}
return view('auth.roles.edit', compact('role', 'names', 'permissions'));
return view('auth.roles.edit', compact('role', 'actions', 'permissions'));
}
/**

15
app/Models/Auth/Permission.php
View File

@ -46,7 +46,20 @@ class Permission extends LaratrustPermission
}
/**
* Remove extras from name.
* Scope to only include by action.
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @param string $action
*
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeAction($query, $action = 'read')
{
return $query->where('name', 'like', $action . '-%');
}
/**
* Transform display name.
*
* @return string
*/

2
app/Models/Setting/Setting.php
View File

@ -34,7 +34,7 @@ class Setting extends Eloquent
* Scope to only include by prefix.
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @param $company_id
* @param string $prefix
*
* @return \Illuminate\Database\Eloquent\Builder
*/