From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 24 Apr 2023 12:30:51 +0000 (+0200)
Subject: wip #5878 @1.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=de3c655c9aa77497f2f33e7e80a8e98b2eb84899;p=cubedesigners_userdatabase.git

wip #5878 @1.5
---

diff --git a/src/app/Models/User.php b/src/app/Models/User.php
index fa41660..576ae44 100644
--- a/src/app/Models/User.php
+++ b/src/app/Models/User.php
@@ -228,7 +228,7 @@ class User extends CubistMagicAuthenticatable implements HasLocalePreference
 
     protected function isCompanyAccessDisabled()
     {
-        $company = Company::find($this->company);
+        $company = Company::withoutGlobalScopes()->find($this->company);
         if (null === $company || !$company->toolbox_access) {
             return true;
         }
diff --git a/src/app/Operations/LoginasOperation.php b/src/app/Operations/LoginasOperation.php
index 2953264..3fbc7cf 100644
--- a/src/app/Operations/LoginasOperation.php
+++ b/src/app/Operations/LoginasOperation.php
@@ -2,7 +2,6 @@
 
 namespace Cubedesigners\UserDatabase\Operations;
 
-use Cubedesigners\UserDatabase\Models\Company;
 use Cubedesigners\UserDatabase\Models\User;
 use Illuminate\Support\Facades\Route;
 
@@ -33,7 +32,7 @@ trait LoginasOperation
             abort(403);
         }
         backpack_auth()->login($user);
-        return redirect('dashboard');
+        return redirect('/');
     }
 
     public function canLoginas($user)