@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function checkRole($role) |
115 | 115 | { |
116 | - return $this->getRoles()->contains(function ($value) use ($role) { |
|
116 | + return $this->getRoles()->contains(function($value) use ($role) { |
|
117 | 117 | return $role == $value->id || Str::is($role, $value->slug); |
118 | 118 | }); |
119 | 119 | } |
@@ -202,9 +202,9 @@ discard block |
||
202 | 202 | return $permissionModel |
203 | 203 | ::select(['permissions.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at']) |
204 | 204 | ->join('permission_role', 'permission_role.permission_id', '=', 'permissions.id') |
205 | - ->join($roleTable, $roleTable . '.id', '=', 'permission_role.role_id') |
|
206 | - ->whereIn($roleTable . '.id', $this->getRoles()->pluck('id')->toArray()) |
|
207 | - ->orWhere($roleTable . '.level', '<', $this->level()) |
|
205 | + ->join($roleTable, $roleTable.'.id', '=', 'permission_role.role_id') |
|
206 | + ->whereIn($roleTable.'.id', $this->getRoles()->pluck('id')->toArray()) |
|
207 | + ->orWhere($roleTable.'.level', '<', $this->level()) |
|
208 | 208 | ->groupBy(['permissions.id', 'permissions.name', 'permissions.slug', 'permissions.description', 'permissions.model', 'permissions.created_at', 'permissions.updated_at', 'permissions.deleted_at', 'pivot_created_at', 'pivot_updated_at']); |
209 | 209 | } |
210 | 210 | |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | */ |
295 | 295 | public function checkPermission($permission) |
296 | 296 | { |
297 | - return $this->getPermissions()->contains(function ($value) use ($permission) { |
|
297 | + return $this->getPermissions()->contains(function($value) use ($permission) { |
|
298 | 298 | return $permission == $value->id || Str::is($permission, $value->slug); |
299 | 299 | }); |
300 | 300 | } |