BF relation
This commit is contained in:
parent
ebc23249c4
commit
925b5f846f
|
|
@ -43,7 +43,7 @@ trait HasPermissions
|
||||||
public function permissions()
|
public function permissions()
|
||||||
{
|
{
|
||||||
$rolePerms = $this->rolePermissions()->get();
|
$rolePerms = $this->rolePermissions()->get();
|
||||||
$directPerms = $this->permissions()->get();
|
$directPerms = $this->individualPermissions()->get();
|
||||||
|
|
||||||
return $rolePerms
|
return $rolePerms
|
||||||
->merge($directPerms)
|
->merge($directPerms)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue