|
@@ -207,8 +207,7 @@ |
|
|
block discarded – undo |
|
207
|
207
|
->whereIn($roleTable . '.id', $this->getRoles()->pluck('id')->toArray()) |
|
208
|
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
|
|
- } |
|
211
|
|
- else |
|
|
210
|
+ } else |
|
212
|
211
|
{ |
|
213
|
212
|
return $permissionModel |
|
214
|
213
|
::select(['permissions.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at']) |
Please login to merge, or discard this patch.