diff --git a/README.md b/README.md index e7a0fe3..d548d7e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ You can install this package via composer: $ composer require hexters/rolevel ``` -Publish vendor from Rolevel +Publish vendor ``` $ php artisan vendor:publish --tag=rolevel ``` @@ -34,7 +34,7 @@ class User extends Authenticatable { . . . ``` -Installing database +Migrate rolevel database ``` $ php artisan migrate ``` @@ -48,7 +48,7 @@ Open file menu & permission in folder `app/Roles/menu_and_permissions.php`. In t return [ [ 'display' => 'Menu Access', // display name - 'uniqkey' => 'module.access.index', // must uniq + 'gate' => 'module.access.index', // must uniq 'url' => null, // URL can set null if menu have submenu 'classId' => '', // id attribute 'className' => '', // class style attribute @@ -60,7 +60,7 @@ Open file menu & permission in folder `app/Roles/menu_and_permissions.php`. In t 'childs' => [ [ 'display' => 'Assign Permissions', - 'uniqkey' => 'module.access.assign.permission.index', + 'gate' => 'module.access.assign.permission.index', 'url' => '/admin/assign/permission', 'classId' => '', 'className' => '', @@ -68,7 +68,7 @@ Open file menu & permission in folder `app/Roles/menu_and_permissions.php`. In t 'permissions' => [ [ - 'uniqkey' => 'module.access.assign.permission.show', + 'gate' => 'module.access.assign.permission.show', 'name' => 'Detail Permissions', // title 'description' => 'Show detail for permission' // info description ], @@ -99,7 +99,7 @@ After that please put script in your master layout, for showing menu access. $viewMenu = function($menus) use (&$viewMenu, $permissions) { $html = ''; foreach($menus as $menu) { - if(in_array($menu['uniqkey'], $permissions)) { + if(in_array($menu['gate'], $permissions)) { $html .= view('vendor.rolevel.menu', ['menu' => $menu, 'view' => $viewMenu]); } } @@ -122,7 +122,7 @@ You should assign role to your User account before. $user = App\User::find(1); $role = App\Role::find(1); - $user->roles()->sync([ $role->id ]); + $user->roles()->sync([ $role->id ], false); ``` In your any controller you should declaration `Gate` to provide access to your module, for example @@ -131,9 +131,8 @@ In your any controller you should declaration `Gate` to provide access to your m namespace App\Http\Controllers; -use Gate; - use Illuminate\Http\Request; +use Illuminate\Support\Facades\Gate; class MenuAccessController extends Controller { @@ -145,7 +144,7 @@ class MenuAccessController extends Controller { public function index() { /** - * Get module.access.assign.permission.index from uniqkey in file menu_and_permissions.php + * Get module.access.assign.permission.index from gate in file menu_and_permissions.php */ if(Gate::denies('module.access.assign.permission.index')) abort(403); @@ -154,7 +153,7 @@ class MenuAccessController extends Controller { . . . ``` -If you have provide access to the button and any condition you can set, for example +In your blade ``` @can('module.access.assign.permission.store') Create Account diff --git a/src/Config/rolevel.php b/src/Config/rolevel.php index 8cf1ea1..f77e741 100644 --- a/src/Config/rolevel.php +++ b/src/Config/rolevel.php @@ -21,6 +21,6 @@ 'content' => 'content' ], - 'show_uniqkey' => in_array(env('APP_ENV'), ['local', 'staging']), + 'show_gate' => in_array(env('APP_ENV'), ['local', 'staging']), ]; \ No newline at end of file diff --git a/src/Controllers/RolevelAssignController.php b/src/Controllers/RolevelAssignController.php index 0cc3a97..2f3f3b4 100644 --- a/src/Controllers/RolevelAssignController.php +++ b/src/Controllers/RolevelAssignController.php @@ -39,7 +39,7 @@ public function assigned(Request $request, $id) { if (Gate::denies('module.access.assign.permission.show')) abort(403); $role = $this->role->findOrFail($id); - $permissions = isset( $request->uniqkeys) ? $request->uniqkeys : []; + $permissions = isset( $request->gates) ? $request->gates : []; $role->update([ 'permissions' => $permissions ]); diff --git a/src/Helpers/Menu.php b/src/Helpers/Menu.php index 24f2f9f..f60815e 100644 --- a/src/Helpers/Menu.php +++ b/src/Helpers/Menu.php @@ -9,8 +9,8 @@ public function findKeys ($menus = []) { $keys = []; $subKeys = []; foreach($menus as $menu) { - if(isset($menu['uniqkey'])) { - $keys[] = $menu['uniqkey']; + if(isset($menu['gate'])) { + $keys[] = $menu['gate']; } if(isset($menu['childs'])) { diff --git a/src/Helpers/Permission.php b/src/Helpers/Permission.php index 7258608..cff71a1 100644 --- a/src/Helpers/Permission.php +++ b/src/Helpers/Permission.php @@ -8,11 +8,11 @@ public function findKeys ($menus = []) { $permissions = []; $childPermissions = []; foreach($menus as $menu) { - $permissions[] = $menu['uniqkey']; + $permissions[] = $menu['gate']; if(isset($menu['permissions']) && is_array($menu['permissions'])) { foreach($menu['permissions'] as $permission) { - if(isset($permission['uniqkey'])) { - $permissions[] = $permission['uniqkey']; + if(isset($permission['gate'])) { + $permissions[] = $permission['gate']; } } } diff --git a/src/Roles/menu_and_permissions.php b/src/Roles/menu_and_permissions.php index 3168da2..bacedaf 100644 --- a/src/Roles/menu_and_permissions.php +++ b/src/Roles/menu_and_permissions.php @@ -3,7 +3,7 @@ return [ [ 'display' => ' Module Access', - 'uniqkey' => 'module.access', + 'gate' => 'module.access', 'url' => null, 'classId' => '', 'className' => '', @@ -28,7 +28,7 @@ 'childs' => [ [ 'display' => 'Assign Permissions', - 'uniqkey' => 'module.access.assign.permission.index', + 'gate' => 'module.access.assign.permission.index', 'url' => '/admin/roles', 'classId' => '', 'className' => '', @@ -43,7 +43,7 @@ */ 'permissions' => [ [ - 'uniqkey' => 'module.access.assign.permission.show', + 'gate' => 'module.access.assign.permission.show', 'name' => 'Show detail role', 'description' => 'Module for assign permission to any module' ] diff --git a/src/Views/assign/detail.blade.php b/src/Views/assign/detail.blade.php index 6cf54d9..4e10d11 100644 --- a/src/Views/assign/detail.blade.php +++ b/src/Views/assign/detail.blade.php @@ -15,12 +15,12 @@ foreach($menus as $menu) { $buttonAssign = view('rolevel::assign.partials.button', ['menu' => $menu, 'permissions' => $permissions]); $html .= '
  • '; - $checked = in_array($menu['uniqkey'], $permissions) ? 'checked' : ''; - $html .= ' '; + $checked = in_array($menu['gate'], $permissions) ? 'checked' : ''; + $html .= ' '; $html .= $menu['display'] . $buttonAssign; - if(config('rolevel.show_uniqkey')) { + if(config('rolevel.show_gate')) { $html .= '
    - ' . $menu['uniqkey'] . ' + ' . $menu['gate'] . '
    '; } diff --git a/src/Views/assign/partials/button.blade.php b/src/Views/assign/partials/button.blade.php index af07f0c..4cd5d43 100644 --- a/src/Views/assign/partials/button.blade.php +++ b/src/Views/assign/partials/button.blade.php @@ -1,10 +1,10 @@ @if(isset($menu['permissions']) && count($menu['permissions']) > 0) - + Assign Permission @endif -
  • - @if(in_array($menu['uniqkey'], $permissions)) + @if(in_array($menu['gate'], $permissions))
    - +
    @endif -