Skip to content

Commit

Permalink
Merge pull request #116 from jeremykenedy/analysis-L3MdMo
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI
  • Loading branch information
jeremykenedy authored Mar 3, 2020
2 parents 60a518b + b83c7c8 commit 4756631
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/Traits/HasRoleAndPermission.php
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@ 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($roleTable, $roleTable . '.id', '=', 'permission_role.role_id')
->whereIn($roleTable . '.id', $this->getRoles()->pluck('id')->toArray())
->orWhere($roleTable . '.level', '<', $this->level())
->join($roleTable, $roleTable.'.id', '=', 'permission_role.role_id')
->whereIn($roleTable.'.id', $this->getRoles()->pluck('id')->toArray())
->orWhere($roleTable.'.level', '<', $this->level())
->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']);
}

Expand Down

0 comments on commit 4756631

Please sign in to comment.