- Fixed issue where getRoles and getPermissions methods returned empt…

…y lists
konovalov-nk · Nov 28, 2016 · 22a95c7 · 22a95c7
1 parent a68bbfe
commit 22a95c7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Kodeine/Acl/Traits/HasPermission.php b/src/Kodeine/Acl/Traits/HasPermission.php
@@ -46,7 +46,7 @@ function () {
         // more permissive permission wins
         // if user has multiple roles we keep
         // true values.
-        foreach ($this->roles as $role) {
+        foreach ($this->roles()->get() as $role) {
             foreach ($role->getPermissions() as $slug => $array) {
                 if ( array_key_exists($slug, $permissions) ) {
                     foreach ($array as $clearance => $value) {

diff --git a/src/Kodeine/Acl/Traits/HasPermissionInheritance.php b/src/Kodeine/Acl/Traits/HasPermissionInheritance.php
@@ -15,7 +15,7 @@ trait HasPermissionInheritance
     public function getPermissionsInherited()
     {
         $rights = [];
-        $permissions = $this->permissions;
+        $permissions = $this->permissions()->get();
 
         // ntfs permissions
         // determine if ntfs is enabled

diff --git a/src/Kodeine/Acl/Traits/HasRole.php b/src/Kodeine/Acl/Traits/HasRole.php
@@ -35,7 +35,7 @@ public function getRoles()
             'acl.getRolesById_'.$this->id,
             config('acl.cacheMinutes'),
             function () {
-                return $this->roles;
+                return $this->roles()->get();
             }
         );