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