Skip to content

P7A-113: update RichText relation HTTP cache tags #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 12, 2025
Merged

P7A-113: update RichText relation HTTP cache tags #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e15ba4
P7A-113: update with shortended version of HTTP cache tags
pspanja May 12, 2025
ed21688
P7A-113: improve language
pspanja May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundle/Resources/views/default/field_type/ezrichtext/embed/content.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{% endif %}

<div {% if embedParams.anchor is defined %}id="{{ embedParams.anchor }}"{% endif %} class="{% if embedParams.align is defined %}align-{{ embedParams.align }}{% endif %}{% if embedParams.class is defined %} {{ embedParams.class }}{% endif %}"{{ data_attributes_str|raw }}>
{{ fos_httpcache_tag('relation-' ~ embedParams.id) }}
{{ fos_httpcache_tag('r' ~ embedParams.id) }}
{% if ibexa.configResolver.getParameter('ng_site_api.richtext_embed_without_subrequest') == true %}
{{ ng_view_content_embedded(embedParams.viewType, params|merge( { "contentId": embedParams.id } )) }}
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion bundle/Resources/views/default/field_type/ezrichtext/embed/content_denied.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +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) }}
{{ fos_httpcache_tag('r' ~ embedParams.id) }}
Content #{{ embedParams.id }}: You do not have permission to view this Content
</div>
2 changes: 1 addition & 1 deletion bundle/Resources/views/default/field_type/ezrichtext/embed/content_inline.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{% set params = params|merge( { "class": embedParams.class } ) %}
{% endif %}

{{ fos_httpcache_tag('relation-' ~ embedParams.id) }}
{{ fos_httpcache_tag('r' ~ embedParams.id) }}
{% if ibexa.configResolver.getParameter('ng_site_api.richtext_embed_without_subrequest') == true %}
{{ ng_view_content_embedded(embedParams.viewType, params|merge( { "contentId": embedParams.id } )) }}
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion bundle/Resources/views/default/field_type/ezrichtext/embed/content_inline_denied.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{ fos_httpcache_tag('relation-' ~ embedParams.id) }}
{{ fos_httpcache_tag('r' ~ embedParams.id) }}
[[ Content #{{ embedParams.id }}: You do not have permission to view this Content ]]
2 changes: 1 addition & 1 deletion bundle/Resources/views/default/field_type/ezrichtext/embed/location.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{% endif %}

<div {% if embedParams.anchor is defined %}id="{{ embedParams.anchor }}"{% endif %} 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) }}
{{ fos_httpcache_tag('rl' ~ embedParams.id) }}
{% if ibexa.configResolver.getParameter('ng_site_api.richtext_embed_without_subrequest') == true %}
{{ ng_view_content_embedded(embedParams.viewType, params|merge( { "locationId": embedParams.id } )) }}
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion bundle/Resources/views/default/field_type/ezrichtext/embed/location_denied.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +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) }}
{{ fos_httpcache_tag('rl' ~ embedParams.id) }}
Location #{{ embedParams.id }}: You do not have permission to view this Location
</div>
2 changes: 1 addition & 1 deletion bundle/Resources/views/default/field_type/ezrichtext/embed/location_inline.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{% set params = params|merge( { "class": embedParams.class } ) %}
{% endif %}

{{ fos_httpcache_tag('relation-location-' ~ embedParams.id) }}
{{ fos_httpcache_tag('rl' ~ embedParams.id) }}
{% if ibexa.configResolver.getParameter('ng_site_api.richtext_embed_without_subrequest') == true %}
{{ ng_view_content_embedded(embedParams.viewType, params|merge( { "locationId": embedParams.id } )) }}
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion bundle/Resources/views/default/field_type/ezrichtext/embed/location_inline_denied.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{ fos_httpcache_tag('relation-location-' ~ embedParams.id) }}
{{ fos_httpcache_tag('rl' ~ embedParams.id) }}
[[ Location #{{ embedParams.id }}: You do not have permission to view this Location ]]
2 changes: 1 addition & 1 deletion bundle/Routing/GeneratorRouter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
/**
* @final
*
* @internal do not use directly; use @router instead to keep the chain routing mechanism
* @internal do not use directly; use @router instead, to keep the chain routing mechanism
*/
class GeneratorRouter implements ChainedRouterInterface, RequestMatcherInterface
{
Expand Down
2 changes: 1 addition & 1 deletion bundle/Routing/UrlAliasRouter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use Symfony\Component\HttpFoundation\Request;

/**
* Do not use directly; use @router instead to keep the chain routing mechanism.
* Do not use directly; use @router instead, to keep the chain routing mechanism.
*/
class UrlAliasRouter extends BaseUrlAliasRouter
{
Expand Down