wait #4050

diff --git a/src/Operations/LoginasOperation.php b/src/Operations/LoginasOperation.php
index bae0b1cba59f144fcc612b13dc33c268d2371281..e69a48a4a8321a32c40caeac6d3955aab74208e0 100644 (file)
--- a/src/Operations/LoginasOperation.php
+++ b/src/Operations/LoginasOperation.php
@@ -14,12 +14,17 @@ trait LoginasOperation
 
     protected function setupLoginasDefaults()
     {
-        $this->crud->addButtonFromView('line', 'loginas', 'user.loginas', 'end');
+        if (can('manageusers')) {
+            $this->crud->addButtonFromView('line', 'loginas', 'user.loginas', 'end');
+        }
     }
 
     protected function loginas($id)
     {
-        $user=User::find($id);
-        backpack_auth()->login($user);
+        if (can('manageusers')) {
+            $user = User::find($id);
+            backpack_auth()->login($user);
+        }
+        return redirect('dashboard');
     }
 }

diff --git a/src/User.php b/src/User.php
index d92f65d379f1b85c03f3bec2a1830f0be273fabb..47f527040716c5cc108438a7ec59139cc50c85c2 100644 (file)
--- a/src/User.php
+++ b/src/User.php
@@ -110,7 +110,7 @@ class User extends CubistMagicAuthenticatable
             return self::$_companyNames;
         }
 
-        return self::$_companyNames[$id];
+        return isset(self::$_companyNames[$id]) ? self::$_companyNames[$id] : '-';
     }
 
     public function getManagedUsers()