wip #5878 @1.5

diff --git a/src/app/Models/User.php b/src/app/Models/User.php
index fa41660e400d8a526a64b54683979ad1684fde6f..576ae44a5b75009797e8bb3dc44e9f559800cd0c 100644 (file)
--- 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 2953264706627a737699d8453be4740b939ab4b3..3fbc7cff9d0e868c380d38c35363b37839fbf0c8 100644 (file)
--- 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)