Skip to content
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

EZEE-2930: Added form_before and form_after to correcctly generate data for Form Builder #1244

Merged
merged 5 commits into from
Mar 16, 2020
Merged

EZEE-2930: Added form_before and form_after to correcctly generate data for Form Builder #1244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
647bcf9
EZEE-2930: Added form_before and form_after to correctly generate dat…
mateuszdebinski Feb 18, 2020
ff9514e
Added missing parameters and corrected edit user twig
mateuszdebinski Feb 18, 2020
b0be366
style code, new line before end file
mateuszdebinski Feb 18, 2020
40ff693
deleted double new line
mateuszdebinski Feb 18, 2020
4267c2b
changed parameters to content-edit-form-after and content-create-form…
mateuszdebinski Feb 21, 2020
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
15 changes: 15 additions & 0 deletions src/bundle/Resources/views/content/content_edit/user_create.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,18 @@
<a class="ez-content-edit-container__close" href="{{ path('_ezpublishLocation', {'locationId': parentGroup.content.versionInfo.contentInfo.mainLocationId}) }}"></a>
{% endblock %}

{% block form_before %}
{{ ezplatform_admin_ui_component_group('content-create-form-before', {
'parentLocation': parentLocation,
'contentType': contentType,
'language': language
}) }}
{% endblock %}

{% block form_after %}
{{ ezplatform_admin_ui_component_group('content-create-form-after', {
'parentLocation': parentLocation,
'contentType': contentType,
'language': language
}) }}
{% endblock %}
24 changes: 22 additions & 2 deletions src/bundle/Resources/views/content/content_edit/user_edit.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{{ contentType.name }} /
{% if creator is not null %}{{ 'created_by'|trans({'%name%': ez_content_name(creator)})|desc('Created by %name%') }} /{% endif %}
{{ user.versionInfo.contentInfo.publishedDate|ez_full_datetime }} /
{{ 'content_id'|trans({'%contentId%': user.id})|desc('Content ID: %contentId%') }}{% if user.versionInfo.contentInfo.mainLocationId %}, {{ 'location_id'|trans({'%locationId%': user.versionInfo.contentInfo.mainLocationId})|desc('Location ID: %locationId%') }}{% endif %}
{{ 'content_id'|trans({'%contentId%': user.id})|desc('Content ID: %contentId%') }}{% if user.versionInfo.contentInfo.mainLocationId %}, {{ 'location_id'|trans({'%locationId%': location.id})|desc('Location ID: %locationId%') }}{% endif %}
</div>
<div class="ez-content-item__errors-wrapper" hidden>
{{ 'errors.in.the.form'|trans({},'content_edit')|desc('Looks like something went wrong. Please check for required fields or errors and correct them') }}
Expand Down Expand Up @@ -46,5 +46,25 @@
{% endblock %}

{% block close_button %}
<a class="ez-content-edit-container__close" href="{{ path('_ezpublishLocation', {'locationId': user.versionInfo.contentInfo.mainLocationId}) }}"></a>
<a class="ez-content-edit-container__close" href="{{ path('_ezpublishLocation', {'locationId': location.id}) }}"></a>
{% endblock %}

{% block form_before %}
{{ ezplatform_admin_ui_component_group('content-edit-form-before', {
'content': user,
'contentType': contentType,
'location': location,
'parent_location': parentLocation,
'language': language
}) }}
{% endblock %}

{% block form_after %}
{{ ezplatform_admin_ui_component_group('content-edit-form-after', {
'content': user,
'contentType': contentType,
'location': location,
'parent_location': parentLocation,
'language': language
}) }}
{% endblock %}