min

code4romania · Jun 17, 2024 · ac96eda · ac96eda
1 parent b7f4653
commit ac96eda
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -6,6 +6,7 @@
 
 use App\Concerns\HasUlid;
 use App\Concerns\MustSetInitialPassword;
+use App\Enums\Role;
 use App\Enums\UserStatus;
 use Filament\Facades\Filament;
 use Filament\Models\Contracts\FilamentUser;
@@ -84,8 +85,7 @@ class User extends Authenticatable implements FilamentUser, HasAvatar, HasName,
         'password_set_at' => 'datetime',
         'password' => 'hashed',
         'is_admin' => 'boolean',
-        'roles' => 'json',
-        //        'roles' => AsEnumCollection::class . ':' . Role::class,
+        'roles' => AsEnumCollection::class . ':' . Role::class,
         'case_permissions' => 'json',
         'admin_permissions' => 'json',
         'status' => UserStatus::class,
@@ -208,11 +208,8 @@ public function getFullNameAttribute(): string
 
     public static function getTenantOrganizationUsers(): Collection
     {
-        return self::whereHas(
-            'organizations',
-            fn (Builder $query) => $query->where('organizations.id', Filament::getTenant()->id)
-        )
-            ->get()
+        return Filament::getTenant()
+            ->users
             ->pluck('full_name', 'id');
     }
 }