From 734e6b65fdc8bd210cc86ff7d6af7e9e049e906e Mon Sep 17 00:00:00 2001 From: Jamie Collins Date: Wed, 13 Nov 2024 08:23:55 +0000 Subject: [PATCH] Resources could not be overridden for table and form functions, because resource was hardcoded in these pages. Updated to take config, then default to the resource classes --- .../PermissionResource/Pages/CreatePermission.php | 7 ++++++- src/Resources/PermissionResource/Pages/EditPermission.php | 7 ++++++- .../PermissionResource/Pages/ListPermissions.php | 8 ++++++-- src/Resources/PermissionResource/Pages/ViewPermission.php | 7 ++++++- src/Resources/RoleResource/Pages/CreateRole.php | 7 ++++++- src/Resources/RoleResource/Pages/EditRole.php | 7 ++++++- src/Resources/RoleResource/Pages/ListRoles.php | 7 ++++++- src/Resources/RoleResource/Pages/ViewRole.php | 7 ++++++- 8 files changed, 48 insertions(+), 9 deletions(-) diff --git a/src/Resources/PermissionResource/Pages/CreatePermission.php b/src/Resources/PermissionResource/Pages/CreatePermission.php index fb1ab1c..cdfc3b7 100644 --- a/src/Resources/PermissionResource/Pages/CreatePermission.php +++ b/src/Resources/PermissionResource/Pages/CreatePermission.php @@ -8,7 +8,12 @@ class CreatePermission extends CreateRecord { - protected static string $resource = PermissionResource::class; + protected static string $resource; + + public function __construct() + { + self::$resource = config('filament-spatie-roles-permissions.resources.PermissionResource', PermissionResource::class); + } protected function getRedirectUrl(): string { diff --git a/src/Resources/PermissionResource/Pages/EditPermission.php b/src/Resources/PermissionResource/Pages/EditPermission.php index e37de2c..2a02c52 100644 --- a/src/Resources/PermissionResource/Pages/EditPermission.php +++ b/src/Resources/PermissionResource/Pages/EditPermission.php @@ -7,7 +7,12 @@ class EditPermission extends EditRecord { - protected static string $resource = PermissionResource::class; + protected static string $resource; + + public function __construct() + { + self::$resource = config('filament-spatie-roles-permissions.resources.PermissionResource', PermissionResource::class); + } protected function getRedirectUrl(): ?string { diff --git a/src/Resources/PermissionResource/Pages/ListPermissions.php b/src/Resources/PermissionResource/Pages/ListPermissions.php index 4168a86..f5fe236 100644 --- a/src/Resources/PermissionResource/Pages/ListPermissions.php +++ b/src/Resources/PermissionResource/Pages/ListPermissions.php @@ -11,7 +11,12 @@ class ListPermissions extends ListRecords { - protected static string $resource = PermissionResource::class; + protected static string $resource; + + public function __construct() + { + self::$resource = config('filament-spatie-roles-permissions.resources.PermissionResource', PermissionResource::class); + } protected function getHeaderActions(): array { @@ -39,6 +44,5 @@ protected function getTableBulkActions(): array ->required(), ])->deselectRecordsAfterCompletion(), ]; - } } diff --git a/src/Resources/PermissionResource/Pages/ViewPermission.php b/src/Resources/PermissionResource/Pages/ViewPermission.php index 6948529..b5419a0 100644 --- a/src/Resources/PermissionResource/Pages/ViewPermission.php +++ b/src/Resources/PermissionResource/Pages/ViewPermission.php @@ -8,7 +8,12 @@ class ViewPermission extends ViewRecord { - protected static string $resource = PermissionResource::class; + protected static string $resource; + + public function __construct() + { + self::$resource = config('filament-spatie-roles-permissions.resources.PermissionResource', PermissionResource::class); + } public function getHeaderActions(): array { diff --git a/src/Resources/RoleResource/Pages/CreateRole.php b/src/Resources/RoleResource/Pages/CreateRole.php index b6c0f15..053788a 100644 --- a/src/Resources/RoleResource/Pages/CreateRole.php +++ b/src/Resources/RoleResource/Pages/CreateRole.php @@ -7,7 +7,12 @@ class CreateRole extends CreateRecord { - protected static string $resource = RoleResource::class; + protected static string $resource; + + public function __construct() + { + self::$resource = config('filament-spatie-roles-permissions.resources.RoleResource', RoleResource::class); + } protected function getRedirectUrl(): string { diff --git a/src/Resources/RoleResource/Pages/EditRole.php b/src/Resources/RoleResource/Pages/EditRole.php index 7d017ee..b127495 100644 --- a/src/Resources/RoleResource/Pages/EditRole.php +++ b/src/Resources/RoleResource/Pages/EditRole.php @@ -9,7 +9,12 @@ class EditRole extends EditRecord { - protected static string $resource = RoleResource::class; + protected static string $resource; + + public function __construct() + { + self::$resource = config('filament-spatie-roles-permissions.resources.RoleResource', RoleResource::class); + } public function getHeaderActions(): array { diff --git a/src/Resources/RoleResource/Pages/ListRoles.php b/src/Resources/RoleResource/Pages/ListRoles.php index 14d6643..7419e9a 100644 --- a/src/Resources/RoleResource/Pages/ListRoles.php +++ b/src/Resources/RoleResource/Pages/ListRoles.php @@ -8,7 +8,12 @@ class ListRoles extends ListRecords { - protected static string $resource = RoleResource::class; + protected static string $resource; + + public function __construct() + { + self::$resource = config('filament-spatie-roles-permissions.resources.RoleResource', RoleResource::class); + } protected function getHeaderActions(): array { diff --git a/src/Resources/RoleResource/Pages/ViewRole.php b/src/Resources/RoleResource/Pages/ViewRole.php index 860015c..2c809d2 100644 --- a/src/Resources/RoleResource/Pages/ViewRole.php +++ b/src/Resources/RoleResource/Pages/ViewRole.php @@ -8,7 +8,12 @@ class ViewRole extends ViewRecord { - protected static string $resource = RoleResource::class; + protected static string $resource; + + public function __construct() + { + self::$resource = config('filament-spatie-roles-permissions.resources.RoleResource', RoleResource::class); + } public function getHeaderActions(): array {