Merge branch 'main' of github.com:backstagephp/cms into 2.x

Author: Baspa

packages/core/src/Resources/ContentResource.php

@@ -1059,7 +1059,7 @@ protected static function getFileUploadField()
                     return $state;
                 }
 
-                if (! $type->og_image_fields || empty($type->og_image_fields)) {
+                if (! $type->og_image_fields || empty($type->og_image_fields) || ! $record) {
                     return [];
                 }
 

packages/users/config/backstage/users.php

@@ -3,11 +3,13 @@
 // config for Backstage/Users
 
 use Backstage\Filament\Users\Pages\ManageApiTokens;
+use Backstage\Filament\Users\Resources\RoleResource\RoleResource;
 use Backstage\Filament\Users\Resources\UserResource\UserResource;
 
 return [
     'resources' => [
         'users' => UserResource::class,
+        'roles' => RoleResource::class,
     ],
 
     'pages' => [

packages/users/src/Resources/RoleResource/Pages/CreateRole.php

@@ -7,5 +7,8 @@
 
 class CreateRole extends CreateRecord
 {
-    protected static string $resource = RoleResource::class;
+    public static function getResource(): string
+    {
+        return config('backstage.users.resources.roles', RoleResource::class);
+    }
 }

packages/users/src/Resources/RoleResource/Pages/EditRole.php

@@ -11,8 +11,11 @@
 
 class EditRole extends EditRecord
 {
-    protected static string $resource = RoleResource::class;
-
+    public static function getResource(): string
+    {
+        return config('backstage.users.resources.roles', RoleResource::class);
+    }
+    
     protected function getHeaderActions(): array
     {
         return [

packages/users/src/Resources/RoleResource/Pages/ListRoles.php

@@ -8,8 +8,11 @@
 
 class ListRoles extends ListRecords
 {
-    protected static string $resource = RoleResource::class;
-
+    public static function getResource(): string
+    {
+        return config('backstage.users.resources.roles', RoleResource::class);
+    }
+    
     protected function getHeaderActions(): array
     {
         return [

packages/users/src/Resources/RoleResource/Pages/ViewRole.php

@@ -8,8 +8,11 @@
 
 class ViewRole extends ViewRecord
 {
-    protected static string $resource = RoleResource::class;
-
+    public static function getResource(): string
+    {
+        return config('backstage.users.resources.roles', RoleResource::class);
+    }
+    
     protected function getHeaderActions(): array
     {
         return [

packages/users/src/Resources/UserResource/Pages/CreateUser.php

@@ -9,7 +9,10 @@
 
 class CreateUser extends CreateRecord
 {
-    protected static string $resource = UserResource::class;
+    public static function getResource(): string
+    {
+        return config('backstage.users.resources.users', UserResource::class);
+    }
 
     public function beforeCreate(): void
     {

packages/users/src/Resources/UserResource/Pages/EditUser.php

@@ -8,7 +8,10 @@
 
 class EditUser extends EditRecord
 {
-    protected static string $resource = UserResource::class;
+    public static function getResource(): string
+    {
+        return config('backstage.users.resources.users', UserResource::class);
+    }
 
     protected function getHeaderActions(): array
     {

packages/users/src/Resources/UserResource/Pages/ListUsers.php

@@ -10,7 +10,10 @@
 
 class ListUsers extends ListRecords
 {
-    protected static string $resource = UserResource::class;
+    public static function getResource(): string
+    {
+        return config('backstage.users.resources.users', UserResource::class);
+    }
 
     protected function getHeaderActions(): array
     {

packages/users/src/Resources/UserResource/Pages/ViewUser.php

@@ -17,7 +17,10 @@
 
 class ViewUser extends ViewRecord
 {
-    protected static string $resource = UserResource::class;
+    public static function getResource(): string
+    {
+        return config('backstage.users.resources.users', UserResource::class);
+    }
 
     protected function getHeaderActions(): array
     {