wip #5873 @0.5

diff --git a/src/app/Jobs/ApplyPermissionsToUsers.php b/src/app/Jobs/ApplyPermissionsToUsers.php
index cdaf7663474e27493e2c1892d494c3731c902ab4..7970ed262c08893aca3ff76d6c4a2581c689de36 100644 (file)
--- 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) {