From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 9 Dec 2020 07:05:00 +0000 (+0100)
Subject: wip #3753
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=dca252aac1c06bc61a54cf3fde4a61a4034d8c8a;p=cubedesigners_userdatabase.git

wip #3753
---

diff --git a/src/Company.php b/src/Company.php
index eb31ae3..b41c146 100644
--- a/src/Company.php
+++ b/src/Company.php
@@ -86,10 +86,15 @@ class Company extends CubistMagicAbstractModel
 
     public static function addOwnerClause(Builder $builder)
     {
-        if(backpack_user()->hasPermissionTo('company:admin')){
+        $bu = backpack_user();
+        if (null === $bu) {
+            $builder->where('id', '<', '0');
             return;
         }
-        $builder->whereIn('id', Permissions::getManagedCompanies(backpack_user()->id));
+        if ($bu->hasPermissionTo('company:admin')){
+            return;
+        }
+        $builder->whereIn('id', Permissions::getManagedCompanies($bu->id));
     }
 
 }
diff --git a/src/User.php b/src/User.php
index 402de80..52894af 100644
--- a/src/User.php
+++ b/src/User.php
@@ -153,7 +153,7 @@ class User extends CubistMagicAuthenticatable
         if ($bu->hasPermissionTo('users:admin')) {
             return;
         }
-        $builder->whereIn('id', Permissions::getManagedUsers(backpack_user()->id));
+        $builder->whereIn('id', Permissions::getManagedUsers($bu->id));
     }