|
@@ -113,7 +113,7 @@ discard block |
|
|
block discarded – undo |
|
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,19 +202,19 @@ discard block |
|
|
block discarded – undo |
|
202
|
202
|
|
|
203
|
203
|
if (config('roles.inheritance')) { |
|
204
|
204
|
return $permissionModel |
|
205
|
|
- ::select([$permissionTable . '.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at']) |
|
206
|
|
- ->join('permission_role', 'permission_role.permission_id', '=', $permissionTable .'.id') |
|
|
205
|
+ ::select([$permissionTable.'.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at']) |
|
|
206
|
+ ->join('permission_role', 'permission_role.permission_id', '=', $permissionTable.'.id') |
|
207
|
207
|
->join($roleTable, $roleTable.'.id', '=', 'permission_role.role_id') |
|
208
|
208
|
->whereIn($roleTable.'.id', $this->getRoles()->pluck('id')->toArray()) |
|
209
|
209
|
->orWhere($roleTable.'.level', '<', $this->level()) |
|
210
|
|
- ->groupBy([$permissionTable . '.id', $permissionTable .'.name', $permissionTable .'.slug', $permissionTable .'.description', $permissionTable .'.model', $permissionTable .'.created_at', 'permissions.updated_at', $permissionTable .'.deleted_at', 'pivot_created_at', 'pivot_updated_at']); |
|
|
210
|
+ ->groupBy([$permissionTable.'.id', $permissionTable.'.name', $permissionTable.'.slug', $permissionTable.'.description', $permissionTable.'.model', $permissionTable.'.created_at', 'permissions.updated_at', $permissionTable.'.deleted_at', 'pivot_created_at', 'pivot_updated_at']); |
|
211
|
211
|
} else { |
|
212
|
212
|
return $permissionModel |
|
213
|
|
- ::select([$permissionTable .'.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at']) |
|
214
|
|
- ->join('permission_role', 'permission_role.permission_id', '=', $permissionTable .'.id') |
|
|
213
|
+ ::select([$permissionTable.'.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at']) |
|
|
214
|
+ ->join('permission_role', 'permission_role.permission_id', '=', $permissionTable.'.id') |
|
215
|
215
|
->join($roleTable, $roleTable.'.id', '=', 'permission_role.role_id') |
|
216
|
216
|
->whereIn($roleTable.'.id', $this->getRoles()->pluck('id')->toArray()) |
|
217
|
|
- ->groupBy([$permissionTable . '.id', $permissionTable .'.name', $permissionTable .'.slug', $permissionTable .'.description', $permissionTable .'.model', $permissionTable .'.created_at', $permissionTable .'.updated_at', $permissionTable .'.deleted_at', 'pivot_created_at', 'pivot_updated_at']); |
|
|
217
|
+ ->groupBy([$permissionTable.'.id', $permissionTable.'.name', $permissionTable.'.slug', $permissionTable.'.description', $permissionTable.'.model', $permissionTable.'.created_at', $permissionTable.'.updated_at', $permissionTable.'.deleted_at', 'pivot_created_at', 'pivot_updated_at']); |
|
218
|
218
|
} |
|
219
|
219
|
} |
|
220
|
220
|
|
|
@@ -304,7 +304,7 @@ discard block |
|
|
block discarded – undo |
|
304
|
304
|
*/ |
|
305
|
305
|
public function checkPermission($permission) |
|
306
|
306
|
{ |
|
307
|
|
- return $this->getPermissions()->contains(function ($value) use ($permission) { |
|
|
307
|
+ return $this->getPermissions()->contains(function($value) use ($permission) { |
|
308
|
308
|
return $permission == $value->id || Str::is($permission, $value->slug); |
|
309
|
309
|
}); |
|
310
|
310
|
} |