Skip to content
This repository has been archived by the owner on Mar 18, 2022. It is now read-only.

Change lists method to pluck as in https://laravel.com/docs/5.3/upgra… #214

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change lists method to pluck as in https://laravel.com/docs/5.3/upgra… #214

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Bican/Roles/Traits/HasRoleAndPermission.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public function rolePermissions()

return $permissionModel::select(['permissions.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at'])
->join('permission_role', 'permission_role.permission_id', '=', 'permissions.id')->join('roles', 'roles.id', '=', 'permission_role.role_id')
->whereIn('roles.id', $this->getRoles()->lists('id')->toArray()) ->orWhere('roles.level', '<', $this->level())
->whereIn('roles.id', $this->getRoles()->pluck('id')->toArray()) ->orWhere('roles.level', '<', $this->level())
->groupBy(['permissions.id', 'pivot_created_at', 'pivot_updated_at']);
}

Expand Down