From 59b36c2d596852a21fa3fc379a93f2b9b057bef4 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 21 Apr 2023 12:51:17 +0200 Subject: [PATCH] wip #5873 @0.5 --- src/app/Jobs/ApplyPermissionsToUsers.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/Jobs/ApplyPermissionsToUsers.php b/src/app/Jobs/ApplyPermissionsToUsers.php index cdaf766..7970ed2 100644 --- a/src/app/Jobs/ApplyPermissionsToUsers.php +++ b/src/app/Jobs/ApplyPermissionsToUsers.php @@ -40,19 +40,25 @@ class ApplyPermissionsToUsers extends Base $perms[$item->model_id][] = $item->role_id; } - $addPermissions = []; $deletePermissions = []; $users = []; foreach (Company::withoutGlobalScopes()->get() as $company) { - $disabledUsers = array_merge($disabledUsers, array_keys($company->getDisabledUsers())); + /** @var $company Company */ + if (!$company->toolbox_access) { + $disabledUsers = array_merge($disabledUsers, array_keys($company->getUsers())); + continue; + } else { + $disabledUsers = array_merge($disabledUsers, array_keys($company->getDisabledUsers())); + } /** @var $company Company */ if ($company->id == 7) { $cubeUsers = array_keys($company->getEnabledUsers()); continue; } + foreach ($company->getEnabledUsers() as $id => $user) { $p = [$rolesByName['extranet:client']]; if ($company->permissions_elearning) { -- 2.39.5