Merge pull request #343 from lexxyungcarter/master

santigarcor · web-flow · commit 600aa87574e8 · 2019-04-17T11:09:31.000-05:00
updated allPermissions() method
diff --git a/src/Traits/LaratrustUserTrait.php b/src/Traits/LaratrustUserTrait.php
@@ -590,7 +590,7 @@ public function allPermissions()
             return $role->permissions;
         });
 
-        return $this->permissions->merge($roles)->unique('name');
+        return $this->permissions()->get()->merge($roles)->unique('name');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -590,7 +590,7 @@ public function allPermissions()`
`590`	`590`	`return $role->permissions;`
`591`	`591`	`});`
`592`	`592`
`593`		`- return $this->permissions->merge($roles)->unique('name');`
	`593`	`+ return $this->permissions()->get()->merge($roles)->unique('name');`
`594`	`594`	`}`
`595`	`595`
`596`	`596`	`/**`