Merge remote-tracking branch 'ezcommunity/master'

ezsystems · Dec 20, 2019 · 2ddbf9c · 2ddbf9c
2 parents 8481488 + a965e70
commit 2ddbf9c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -34,6 +34,7 @@
         "ezsystems/ezplatform-page-builder": "^2.0@dev",
         "ezsystems/ezplatform-page-fieldtype": "^2.0@dev",
         "ezsystems/ezplatform-matrix-fieldtype": "^2.0@dev",
+        "ezsystems/ezplatform-query-fieldtype": "^2.0@dev",
         "ezsystems/ezplatform-rest": "^1.0@dev",
         "ezsystems/ezplatform-richtext": "^2.0@dev",
         "ezsystems/ezplatform-solr-search-engine": "^3.0@dev",

diff --git a/config/bundles.php b/config/bundles.php
@@ -60,6 +60,7 @@
     EzSystems\EzPlatformWorkflowBundle\EzPlatformWorkflowBundle::class => ['all' => true],
     EzSystems\EzPlatformCalendarBundle\EzPlatformCalendarBundle::class => ['all' => true],
     EzSystems\EzPlatformGraphQL\EzSystemsEzPlatformGraphQLBundle::class => ['all' => true],
+    EzSystems\EzPlatformQueryFieldType\Symfony\EzSystemsEzPlatformQueryFieldTypeBundle::class => ['all' => true],
     EzSystems\EzPlatformContentComparisonBundle\EzPlatformContentComparisonBundle::class => ['all' => true],
     // GraphQL bundles have to be loaded after EzSystemsEzPlatformGraphQLBundle
     Overblog\GraphQLBundle\OverblogGraphQLBundle::class => ['all' => true],

diff --git a/config/routes/ezplatform_query_field_type.yaml b/config/routes/ezplatform_query_field_type.yaml
@@ -0,0 +1,2 @@
+ezplatform_query_field_type:
+    resource: '@EzSystemsEzPlatformQueryFieldTypeBundle/Resources/config/routing/rest.yaml'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ezplatform_query_field_type:
		resource: '@EzSystemsEzPlatformQueryFieldTypeBundle/Resources/config/routing/rest.yaml'