Refactor

vormkracht10 · Nov 28, 2024 · 26e8bb1 · 26e8bb1
1 parent 7fac4c1
commit 26e8bb1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Models/Media.php b/src/Models/Media.php
@@ -38,7 +38,7 @@ protected static function booted()
                 $currentTenant = app($tenantModel)->current();
 
                 if ($currentTenant) {
-                    $model->{$tenantRelationship . '_id'} = $currentTenant->id;
+                    $model->{$tenantRelationship . '_ulid'} = $currentTenant->id;
                 }
             }
         });
@@ -53,7 +53,7 @@ public function tenant()
         if ($tenantRelationship && class_exists($tenantModel)) {
             return $this->belongsTo(
                 $tenantModel,
-                $tenantRelationship . '_id'
+                $tenantRelationship . '_ulid'
             );
         }
 

diff --git a/src/Resources/MediaResource.php b/src/Resources/MediaResource.php
@@ -24,7 +24,7 @@ public static function isScopedToTenant(): bool
 
     public static function getTenantOwnershipRelationshipName(): string
     {
-        return config('media-picker.tenant_ownership_relationship_name') ?? Filament::getTenantOwnershipRelationshipName();
+        return config('media-picker.tenant_relationship') ?? Filament::getTenantOwnershipRelationshipName();
     }
 
     public static function getModelLabel(): string
@@ -65,7 +65,7 @@ public static function getNavigationBadge(): ?string
 
         if (Filament::hasTenancy() && config('media-picker.is_tenant_aware')) {
             return static::getEloquentQuery()
-                ->where(config('media-picker.tenant_ownership_relationship_name') . '_id', Filament::getTenant()->id)
+                ->where(config('media-picker.tenant_relationship') . '_ulid', Filament::getTenant()->id)
                 ->count();
         }