diff --git a/app/Models/User.php b/app/Models/User.php index c6cac9f388..2c56c43737 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -237,11 +237,14 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo $permissions = json_decode($this->permissions, true); } - foreach ($permissions as $permission) { - if ($permission != 0) { - return true; + if (($permissions) && (is_array($permissions))) { + foreach ($permissions as $permission) { + if ($permission != 0) { + return true; + } } } + return false; } diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php index acde9ceaed..cead5c8081 100644 --- a/app/Observers/UserObserver.php +++ b/app/Observers/UserObserver.php @@ -49,7 +49,8 @@ class UserObserver 'end_date', 'autoassign_licenses', 'vip', - 'password' + 'password', + 'permissions' ]; $changed = [];