Olivier Massot 3 роки тому
батько
коміт
682aefc630
2 змінених файлів з 7 додано та 6 видалено
  1. 1 1
      .env.docker
  2. 6 5
      src/Entity/Public/FederationStructure.php

+ 1 - 1
.env.docker

@@ -7,7 +7,7 @@ DATABASE_URL=mysql://root:mysql660@db:3306/opentalent?serverVersion=5.7
 ###< doctrine/doctrine-bundle ###
 
 ###> nelmio/cors-bundle ###
-CORS_ALLOW_ORIGIN=^https?://(localhost|127\.0\.0\.1)(:[0-9]+)|local.admin.opentalent.fr|local.app.opentalent.fr?$
+CORS_ALLOW_ORIGIN=^https?:\/\/(localhost|127\.0\.0\.1|(local.(admin|app|frames).opentalent.fr))(:[0-9]+)?$
 ###< nelmio/cors-bundle ###
 
 ###> api v1 ###

+ 6 - 5
src/Entity/Public/FederationStructure.php

@@ -23,7 +23,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
     collectionOperations: [
         'get' => [
             'method' => 'GET',
-            'path' => '/public/federation_structures', // required query : '?parent={\d+}'
+            'path' => '/public/federation_structures',
             'normalization_context' => ['groups' => ['federation_structure_collection_get']],
         ]
     ],
@@ -34,7 +34,8 @@ use Symfony\Component\Serializer\Annotation\Groups;
             'requirements' => ['id' => '\d+'],
             'normalization_context' => ['groups' => ['federation_structure_item_get']]
         ]
-    ]
+    ],
+    attributes: ["pagination_enabled" => false]
 )]
 #[ApiFilter(SearchFilter::class, properties: ['name' => 'partial', 'city' => 'exact'])]
 #[ApiFilter(NumericFilter::class, properties: ['id', 'parentId'])]
@@ -111,11 +112,11 @@ class FederationStructure
     private ?array $practices;
 
     #[ORM\Column(type: 'integer')]
-    #[Groups(["federation_structure_item_get"])]
+    #[Groups(["federation_structure_item_get", "federation_structure_collection_get"])]
     private ?int $parentId;
 
-    #[ORM\Column(type: 'integer')]
-    #[Groups(["federation_structure_item_get"])]
+    #[ORM\Column]
+    #[Groups(["federation_structure_item_get", "federation_structure_collection_get"])]
     private ?string $parentName;
 
     #[ORM\Column(type: 'simple_array')]