From: Vincent Vanwaelscappel Date: Wed, 2 Dec 2020 15:52:21 +0000 (+0100) Subject: wip #3753 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a712f3dc46e9eec58b10de83afe673e2f0894415;p=cubedesigners_userdatabase.git wip #3753 @1 --- diff --git a/src/Company.php b/src/Company.php index be7ff30..3e1d989 100644 --- a/src/Company.php +++ b/src/Company.php @@ -86,7 +86,10 @@ class Company extends CubistMagicAbstractModel public static function addOwnerClause(Builder $builder) { - $builder->whereIn( 'id', backpack_user()->getManagedCompanies()); + if(backpack_user()->hasPermissionTo('company:admin')){ + return; + } + $builder->whereIn('id', Permissions::getManagedCompanies(backpack_user()->id)); } } diff --git a/src/Permissions.php b/src/Permissions.php index 50abc71..37348cd 100644 --- a/src/Permissions.php +++ b/src/Permissions.php @@ -28,6 +28,7 @@ class Permissions ]; foreach (User::withoutGlobalScopes()->get() as $user) { + /** @var $user User */ if (!isset($data['companyUsers'][$user->company])) { $data['companyUsers'][$user->company] = []; }