Merge remote-tracking branch 'origin/master' into develop

2025-10-30 14:03:23 +00:00
parent 6dbb836a01 7395b1a4eb
commit 16e93f9e18
2 changed files with 8 additions and 4 deletions
@@ -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;
    }

@@ -49,7 +49,8 @@ class UserObserver
            'end_date',
            'autoassign_licenses',
            'vip',
-            'password'
+            'password',
+            'permissions'
        ];
        
        $changed = [];