Skip to content

Update content admin templates context #30

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
javihgil merged 2 commits into from
Jun 8, 2026
Merged

Update content admin templates context #30

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
aedc2a7
Update content admin templates context
javihgil Jun 5, 2026
f1d9b9c
Apply CI fixes
javihgil Jun 8, 2026
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 src/Admin/ActionListener/ContentVersion/TranslationsListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use Softspring\CmsBundle\Manager\RouteManagerInterface;
use Softspring\CmsBundle\Model\ContentInterface;
use Softspring\CmsBundle\Model\ContentVersionInterface;
use Softspring\CmsBundle\Render\RenderErrorException;
use Softspring\CmsBundle\Render\Error\RenderErrorException;
use Softspring\CmsBundle\Request\FlashNotifier;
use Softspring\CmsBundle\Translator\TranslatableContext;
use Softspring\CmsTranslationPlugin\SfsCmsTranslationPlugin;
Expand Down
4 changes: 2 additions & 2 deletions src/Translator/TranslatorExtractor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function extract(VersionInterface $version): array
$seo = $version->getSeo();
foreach ($contentConfig as $field => $fieldConfig) {
$extractedTranslations = $this->extractFieldTranslations($fieldConfig, $seo[$field] ?? null);
if (null !== $extractedTranslations) {
if ($extractedTranslations instanceof Translation) {
$translations['_seo'][$field] = $extractedTranslations;
}
}
Expand Down Expand Up @@ -151,7 +151,7 @@ protected function extractModule(array $moduleData): array
continue;
}
$extractedTranslations = $this->extractFieldTranslations($fieldConfig, $moduleData[$field] ?? null);
if (null !== $extractedTranslations) {
if ($extractedTranslations instanceof Translation) {
$translations[$field] = $extractedTranslations;
}
}
Expand Down
24 changes: 12 additions & 12 deletions templates/admin/content/version_translations.bootstrap5.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
href="{{ url('sfs_cms_admin_content_'~content_type~'_list') }}">{{ ('admin_'~content_type~'.list.breadcrumb')|trans }}</a>
</li>
<li class="breadcrumb-item"><a
href="{{ url('sfs_cms_admin_content_'~content_type~'_details', {'content':entity}) }}">{{ ('admin_'~content_type~'.read.breadcrumb')|trans({'%name%': entity.name}) }}</a>
href="{{ url('sfs_cms_admin_content_'~content_type~'_details', {'content':content_entity}) }}">{{ ('admin_'~content_type~'.read.breadcrumb')|trans({'%name%': content_entity.name}) }}</a>
</li>
<li class="breadcrumb-item active"
aria-current="content">{{ ('admin_'~content_type~'.translations.breadcrumb')|trans({'%name%':content_entity.name}) }}</li>
{% endblock breadcrums_content %}

{% block content %}
{% include ['@content/'~content_type~'/admin/_content_title.html.twig', '@SfsCms/admin/content/_content_title.html.twig'] with {'current':'translations', 'content_type':content_type, 'content_entity':entity, 'version_entity': prev_version|default(false)} %}
{% include ['@content/'~content_type~'/admin/_content_tabs.html.twig', '@SfsCms/admin/content/_content_tabs.html.twig'] with {'current':'translations', 'content':content_entity, 'entity':version_entity} %}
{% include ['@content/'~content_type~'/admin/_content_title.html.twig', '@SfsCms/admin/content/_content_title.html.twig'] with {'current':'translations', 'content_type':content_type, 'content_entity':content_entity, 'version_entity': prev_version|default(false)} %}
{% include ['@content/'~content_type~'/admin/_content_tabs.html.twig', '@SfsCms/admin/content/_content_tabs.html.twig'] with {'current':'translations', 'content':content_entity, 'version_entity': version_entity} %}

<div class="container-fluid mb-3">
<div class="row">
<div class="col">
<div class="float-end">
{% if not content_config.admin.version_translations_import.is_granted or is_granted(content_config.admin.version_translations_import.is_granted, entity) %}
{% if not content_config.admin.version_translations_import.is_granted or is_granted(content_config.admin.version_translations_import.is_granted, content_entity) %}
<a class="btn btn-outline-secondary"
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_import', {'content':entity.id, 'back':'translations', 'version':prev_version.id}) }}">
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_import', {'content':content_entity.id, 'back':'translations', 'version':prev_version.id}) }}">
<i class="bi bi-upload"></i>
{{ ('admin_'~content_type~'.translations.actions.import_translations.link')|trans }}
</a>
Expand All @@ -43,7 +43,7 @@
</a>
{% endif %}

{% if not content_config.admin.version_translations_export.is_granted or is_granted(content_config.admin.version_translations_export.is_granted, entity) %}
{% if not content_config.admin.version_translations_export.is_granted or is_granted(content_config.admin.version_translations_export.is_granted, content_entity) %}
{% if content_config.admin.version_translations_export.formats|length > 1 %}
<div class="btn-group">
<button type="button" class="btn btn-outline-secondary dropdown-toggle" title="Export"
Expand All @@ -54,15 +54,15 @@
<ul class="dropdown-menu dropdown-menu-end">
{% for format in content_config.admin.version_translations_export.formats %}
<li><a class="dropdown-item"
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export_all', {'content':entity.id, 'back':'translations', 'version':prev_version.id, 'format': format}) }}">{{ ('admin_page.translations.export.formats.'~format)|trans }}</a>
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export_all', {'content':content_entity.id, 'back':'translations', 'version':prev_version.id, 'format': format}) }}">{{ ('admin_page.translations.export.formats.'~format)|trans }}</a>
</li>
{% endfor %}
</ul>
</div>
{% else %}
{% set format = content_config.admin.version_translations_export.formats|first %}
<a class="btn btn-outline-secondary"
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export_all', {'content':entity.id, 'back':'translations', 'version':prev_version.id, 'format': format}) }}"
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export_all', {'content':content_entity.id, 'back':'translations', 'version':prev_version.id, 'format': format}) }}"
title="{{ ('admin_page.translations.export.formats.'~format)|trans }}">
<i class="bi bi-download"></i>
{{ ('admin_'~content_type~'.translations.actions.export_translations.link')|trans }}
Expand Down Expand Up @@ -149,7 +149,7 @@
</span>
{% endif %}

{% if not content_config.admin.version_translations_export.is_granted or is_granted(content_config.admin.version_translations_export.is_granted, entity) %}
{% if not content_config.admin.version_translations_export.is_granted or is_granted(content_config.admin.version_translations_export.is_granted, content_entity) %}
{% if content_config.admin.version_translations_export.formats|length > 1 %}
<div class="btn-group">
<button type="button" class="btn btn-link dropdown-toggle"
Expand All @@ -160,15 +160,15 @@
<ul class="dropdown-menu dropdown-menu-end">
{% for format in content_config.admin.version_translations_export.formats %}
<li><a class="dropdown-item"
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export', {'content':entity.id, 'back':'translations', 'version':prev_version.id, 'target':locale, 'format': format}) }}">{{ ('admin_page.translations.export.formats.'~format)|trans }}</a>
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export', {'content':content_entity.id, 'back':'translations', 'version':prev_version.id, 'target':locale, 'format': format}) }}">{{ ('admin_page.translations.export.formats.'~format)|trans }}</a>
</li>
{% endfor %}
</ul>
</div>
{% else %}
{% set format = content_config.admin.version_translations_export.formats|first %}
<a class="btn btn-link float-end p-0"
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export', {'content':entity.id, 'back':'translations', 'version':prev_version.id, 'target':locale, 'format': format}) }}"
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export', {'content':content_entity.id, 'back':'translations', 'version':prev_version.id, 'target':locale, 'format': format}) }}"
title="{{ ('admin_page.translations.export.formats.'~format)|trans }}">
<i class="bi bi-download"></i>
</a>
Expand Down Expand Up @@ -227,7 +227,7 @@
{{ form_rest(form) }}

<div class="d-flex justify-content-end align-items-center">
<a href="{{ url('sfs_cms_admin_content_'~content_type~'_details', {'content':entity.id}) }}"
<a href="{{ url('sfs_cms_admin_content_'~content_type~'_details', {'content':content_entity.id}) }}"
class="btn btn-outline-secondary">{{ ('admin_'~content_type~'.translations.actions.cancel.button')|trans }}</a>
<input type="submit" value="{{ ('admin_'~content_type~'.translations.actions.save.button')|trans }}"
class="btn btn-primary ms-3"/>
Expand Down
22 changes: 11 additions & 11 deletions templates/admin/content/version_translations.semantic-ui.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
<a class="section"
href="{{ url('sfs_cms_admin_content_'~content_type~'_list') }}">{{ ('admin_'~content_type~'.list.breadcrumb')|trans }}</a>
<i class="right chevron icon divider"></i>
<a class="section" href="{{ url('sfs_cms_admin_content_'~content_type~'_details', {'content':entity.id}) }}">{{ ('admin_'~content_type~'.read.breadcrumb')|trans({'%name%': entity.name}) }}</a>
<a class="section" href="{{ url('sfs_cms_admin_content_'~content_type~'_details', {'content':content_entity.id}) }}">{{ ('admin_'~content_type~'.read.breadcrumb')|trans({'%name%': content_entity.name}) }}</a>
<i class="right chevron icon divider"></i>
<a class="section active">{{ ('admin_'~content_type~'.translations.breadcrumb')|trans({'%name%':content_entity.name}) }}</a>
{% endblock breadcrums_content %}

{% block content %}
{% include ['@content/'~content_type~'/admin/_content_tabs.html.twig', '@SfsCms/admin/content/_content_tabs.html.twig'] with {'current':'translations', 'content':content_entity, 'entity':version_entity} %}
{% include ['@content/'~content_type~'/admin/_content_tabs.html.twig', '@SfsCms/admin/content/_content_tabs.html.twig'] with {'current':'translations', 'content':content_entity, 'version_entity': version_entity} %}
<div class="ui bottom attached active tab segment">
<div class="ui right aligned grid clearing" style="margin-bottom: 0">
<div class="ui buttons column">
{% if not content_config.admin.version_translations_import.is_granted or is_granted(content_config.admin.version_translations_import.is_granted, entity) %}
{% if not content_config.admin.version_translations_import.is_granted or is_granted(content_config.admin.version_translations_import.is_granted, content_entity) %}
<a class="ui blue labeled icon button"
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_import', {'content':entity.id, 'back':'translations', 'version':prev_version.id}) }}">
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_import', {'content':content_entity.id, 'back':'translations', 'version':prev_version.id}) }}">
<i class="icon upload"></i>
{{ ('admin_'~content_type~'.translations.actions.import_translations.link')|trans }}
</a>
Expand All @@ -43,7 +43,7 @@
{% endif %}


{% if not content_config.admin.version_translations_export.is_granted or is_granted(content_config.admin.version_translations_export.is_granted, entity) %}
{% if not content_config.admin.version_translations_export.is_granted or is_granted(content_config.admin.version_translations_export.is_granted, content_entity) %}
{% if content_config.admin.version_translations_export.formats|length > 1 %}
{# <div class="btn-group">#}
{# <button type="button" class="btn btn-outline-secondary dropdown-toggle" title="Export"#}
Expand All @@ -54,7 +54,7 @@
{# <ul class="dropdown-menu dropdown-menu-end">#}
{# {% for format in content_config.admin.version_translations_export.formats %}#}
{# <li><a class="dropdown-item"#}
{# href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export_all', {'content':entity.id, 'back':'translations', 'format': format, 'version':prev_version.id}))}}">{{ ('admin_page.translations.export.formats.'~format)|trans }}</a>#}
{# href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export_all', {'content':content_entity.id, 'back':'translations', 'format': format, 'version':prev_version.id}))}}">{{ ('admin_page.translations.export.formats.'~format)|trans }}</a>#}
{# </li>#}
{# {% endfor %}#}
{# </ul>#}
Expand All @@ -63,7 +63,7 @@
{% else %}
{% set format = content_config.admin.version_translations_export.formats|first %}
<a class="ui red labeled icon button"
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export_all', {'content':entity.id, 'back':'translations', 'format': format, 'version':prev_version.id}) }}"
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export_all', {'content':content_entity.id, 'back':'translations', 'format': format, 'version':prev_version.id}) }}"
title="{{ ('admin_page.translations.export.formats.'~format)|trans }}">
<i class="icon download"></i>
{{ ('admin_'~content_type~'.translations.actions.export_translations.link')|trans }}
Expand Down Expand Up @@ -133,7 +133,7 @@
</span>
{% endif %}

{% if not content_config.admin.version_translations_export.is_granted or is_granted(content_config.admin.version_translations_export.is_granted, entity) %}
{% if not content_config.admin.version_translations_export.is_granted or is_granted(content_config.admin.version_translations_export.is_granted, content_entity) %}
{% if content_config.admin.version_translations_export.formats|length > 1 %}
{# <div class="btn-group">#}
{# <button type="button" class="btn btn-link dropdown-toggle"#}
Expand All @@ -144,7 +144,7 @@
{# <ul class="dropdown-menu dropdown-menu-end">#}
{# {% for format in content_config.admin.version_translations_export.formats %}#}
{# <li><a class="dropdown-item"#}
{# href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export', {'content':entity.id, 'back':'translations', 'target':locale, 'format': format, 'version':prev_version.id}))}}">{{ ('admin_page.translations.export.formats.'~format)|trans }}</a>#}
{# href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export', {'content':content_entity.id, 'back':'translations', 'target':locale, 'format': format, 'version':prev_version.id}))}}">{{ ('admin_page.translations.export.formats.'~format)|trans }}</a>#}
{# </li>#}
{# {% endfor %}#}
{# </ul>#}
Expand All @@ -153,7 +153,7 @@
{% else %}
{% set format = content_config.admin.version_translations_export.formats|first %}
<a class="ui right floated icon button"
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export', {'content':entity.id, 'back':'translations', 'target':locale, 'format': format, 'version':prev_version.id}) }}"
href="{{ url('sfs_cms_admin_content_'~content_type~'_translations_export', {'content':content_entity.id, 'back':'translations', 'target':locale, 'format': format, 'version':prev_version.id}) }}"
title="{{ ('admin_page.translations.export.formats.'~format)|trans }}">
<i class="icon download"></i>
</a>
Expand Down Expand Up @@ -214,7 +214,7 @@
<div class="ui hidden divider"></div>
<div class="ui buttons">
<button class="ui labeled icon primary button" type="submit"><i class="save icon"></i> {{ ('admin_'~content_type~'.translations.actions.save.button')|trans }}</button>
<a href="{{ url('sfs_cms_admin_content_'~content_type~'_details', {'content':entity.id}) }}" class="ui button">{{ ('admin_'~content_type~'.translations.actions.cancel.button')|trans }}</a>
<a href="{{ url('sfs_cms_admin_content_'~content_type~'_details', {'content':content_entity.id}) }}" class="ui button">{{ ('admin_'~content_type~'.translations.actions.cancel.button')|trans }}</a>
</div>
{{ form_end(form) }}
</div>
Expand Down
Loading