NGSTACK-416: set layout to true for full view fallback

netgen · Sep 9, 2020 · 14fa6bc · 14fa6bc
1 parent 90bd5b8
commit 14fa6bc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/bundle/Resources/views/content_view_fallback/to_ez_platform/view.html.twig b/bundle/Resources/views/content_view_fallback/to_ez_platform/view.html.twig
@@ -1,15 +1,19 @@
 {# content \Netgen\EzPlatformSiteApi\API\Values\Content #}
 {# location \Netgen\EzPlatformSiteApi\API\Values\Location #}
 
+{% set viewType = app.request.attributes.get('viewType') %}
+{% set layout = (viewType == 'full') %}
+
 {% if ezpublish.configResolver.getParameter('ng_fallback_without_subrequest') == true %}
-    {{ ng_ez_view_content(location.innerLocation|default(content.innerContent), app.request.attributes.get('viewType')) }}
+    {{ ng_ez_view_content(location.innerLocation|default(content.innerContent), viewType, [], layout) }}
 {% else %}
     {{ render(
         controller(
             'ez_content:viewAction', {
                 'content': content.innerContent,
                 'location': location.innerLocation,
-                'viewType': app.request.attributes.get('viewType')
+                'viewType': viewType,
+                'layout': layout
             }
         )
     ) }}

diff --git a/bundle/Resources/views/content_view_fallback/to_site_api/view.html.twig b/bundle/Resources/views/content_view_fallback/to_site_api/view.html.twig
@@ -1,15 +1,19 @@
 {# content \Netgen\EzPlatformSiteApi\API\Values\Content #}
 {# location \Netgen\EzPlatformSiteApi\API\Values\Location #}
 
+{% set viewType = app.request.attributes.get('viewType') %}
+{% set layout = (viewType == 'full') %}
+
 {% if ezpublish.configResolver.getParameter('ng_fallback_without_subrequest') == true %}
-    {{ ng_view_content(location|default(content), app.request.attributes.get('viewType')) }}
+    {{ ng_view_content(location|default(content), viewType, [], layout) }}
 {% else %}
     {{ render(
         controller(
             'ng_content:viewAction', {
                 'contentId': content.id,
                 'locationId': location.id,
-                'viewType': app.request.attributes.get('viewType')
+                'viewType': viewType,
+                'layout': layout
             }
         )
     ) }}