Merge branch '7.0'

ezecosystem · Mar 6, 2018 · 11b1c7e · 11b1c7e
2 parents 97d1c8d + d5abbad
commit 11b1c7e
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 0 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/content.html.twig b/eZ/Bundle/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/content.html.twig
@@ -6,6 +6,7 @@
     {% set params = params|merge( { "linkParameters": embedParams.link } ) %}
 {% endif %}
 <div class="{% if embedParams.align is defined %}align-{{ embedParams.align }}{% endif %}{% if embedParams.class is defined %} {{ embedParams.class }}{% endif %}">
+    {{ fos_httpcache_tag('relation-' ~ embedParams.id) }}
     {{
         render(
             controller(

diff --git a/...dle/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/content_denied.html.twig b/...dle/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/content_denied.html.twig
@@ -1,3 +1,4 @@
 <div class="{% if embedParams.align is defined %}align-{{ embedParams.align }}{% endif %}{% if embedParams.class is defined %} {{ embedParams.class }}{% endif %}">
+    {{ fos_httpcache_tag('relation-' ~ embedParams.id) }}
     Content #{{ embedParams.id }}: You do not have permission to view this Content
 </div>
diff --git a/...dle/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/content_inline.html.twig b/...dle/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/content_inline.html.twig
@@ -5,6 +5,7 @@
 {% if embedParams.link is defined  %}
     {% set params = params|merge( { "linkParameters": embedParams.link } ) %}
 {% endif %}
+{{ fos_httpcache_tag('relation-' ~ embedParams.id) }}
 {{
     render(
         controller(

diff --git a/...ublishCoreBundle/Resources/views/FieldType/RichText/embed/content_inline_denied.html.twig b/...ublishCoreBundle/Resources/views/FieldType/RichText/embed/content_inline_denied.html.twig
@@ -1 +1,2 @@
+{{ fos_httpcache_tag('relation-' ~ embedParams.id) }}
 [[ Content #{{ embedParams.id }}: You do not have permission to view this Content ]]
diff --git a/eZ/Bundle/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/location.html.twig b/eZ/Bundle/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/location.html.twig
@@ -6,6 +6,7 @@
     {% set params = params|merge( { "linkParameters": embedParams.link } ) %}
 {% endif %}
 <div class="{% if embedParams.align is defined %}align-{{ embedParams.align }}{% endif %}{% if embedParams.class is defined %} {{ embedParams.class }}{% endif %}">
+    {{ fos_httpcache_tag('relation-location-' ~ embedParams.id) }}
     {{
         render(
             controller(

diff --git a/...le/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/location_denied.html.twig b/...le/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/location_denied.html.twig
@@ -1,3 +1,4 @@
 <div class="{% if embedParams.align is defined %}align-{{ embedParams.align }}{% endif %}{% if embedParams.class is defined %} {{ embedParams.class }}{% endif %}">
+    {{ fos_httpcache_tag('relation-location-' ~ embedParams.id) }}
     Location #{{ embedParams.id }}: You do not have permission to view this Location
 </div>
diff --git a/...le/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/location_inline.html.twig b/...le/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/location_inline.html.twig
@@ -5,6 +5,7 @@
 {% if embedParams.link is defined  %}
     {% set params = params|merge( { "linkParameters": embedParams.link } ) %}
 {% endif %}
+{{ fos_httpcache_tag('relation-location-' ~ embedParams.id) }}
 {{
     render(
         controller(

diff --git a/...blishCoreBundle/Resources/views/FieldType/RichText/embed/location_inline_denied.html.twig b/...blishCoreBundle/Resources/views/FieldType/RichText/embed/location_inline_denied.html.twig
@@ -1 +1,2 @@
+{{ fos_httpcache_tag('relation-location-' ~ embedParams.id) }}
 [[ Location #{{ embedParams.id }}: You do not have permission to view this Location ]]
diff --git a/eZ/Bundle/EzPublishCoreBundle/Resources/views/content_fields.html.twig b/eZ/Bundle/EzPublishCoreBundle/Resources/views/content_fields.html.twig
@@ -267,6 +267,7 @@
     {% if not ez_is_field_empty( content, field ) %}
     <ul {{ block( 'field_attributes' ) }}>
         {% for contentId in field.value.destinationContentIds %}
+        {{ fos_httpcache_tag('relation-' ~ contentId) }}
         <li>
             {{ render( controller( "ez_content:viewAction", {'contentId': contentId, 'viewType': 'embed', 'noLayout': 1} ) ) }}
         </li>
@@ -432,6 +433,7 @@
 {% block ezobjectrelation_field %}
 {% spaceless %}
 {% if not ez_is_field_empty( content, field ) %}
+    {{ fos_httpcache_tag('relation-' ~ field.value.destinationContentId) }}
     <div {{ block( 'field_attributes' ) }}>
         {{ render( controller( "ez_content:viewAction", {'contentId': field.value.destinationContentId, 'viewType': 'text_linked', 'noLayout': 1} ) ) }}
     </div>