From 42e0a152753fdfed40a65ab327597d7d50a762ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20W=C3=B3js?= Date: Tue, 9 Jan 2024 21:09:15 +0100 Subject: [PATCH 1/2] IBX-7492: Fixed error when editing image in user profile --- .../themes/admin/ui/field_type/edit/ezimage.html.twig | 10 ++++++++-- .../admin/ui/field_type/edit/ezimageasset.html.twig | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimage.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimage.html.twig index de6ed8be2b..7a16ba78ac 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimage.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimage.html.twig @@ -45,12 +45,18 @@ {{ 'content.field_type.ezimage.preview'|trans|desc('Preview') }} + + {% if version_info is defined %} + {% set content_id = version_info.contentInfo.id %} + {% set version_no = version_info.versionNo %} + {% endif %} + {{ ibexa_render_component_group( 'image-edit-actions-after', { 'fieldDefinitionIdentifier' : form.parent.vars.value.fieldDefinition.identifier, - 'contentId' : app.request.get('contentId'), - 'versionNo' : app.request.get('versionNo'), + 'contentId' : content_id|default(app.request.get('contentId')), + 'versionNo' : version_no|default(app.request.get('versionNo')), 'disabled': readonly ? true : false, } ) }} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimageasset.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimageasset.html.twig index 78356d9423..6ac777f371 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimageasset.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimageasset.html.twig @@ -135,12 +135,18 @@ {{ 'content.field_type.ezimage.preview'|trans|desc('Preview') }} + + {% if version_info is defined %} + {% set content_id = version_info.contentInfo.id %} + {% set version_no = version_info.versionNo %} + {% endif %} + {{ ibexa_render_component_group( 'image-edit-actions-after', { 'fieldDefinitionIdentifier' : form.parent.vars.value.fieldDefinition.identifier, - 'contentId' : app.request.get('contentId'), - 'versionNo' : app.request.get('versionNo'), + 'contentId' : content_id|default(app.request.get('contentId')), + 'versionNo' : version_no|default(app.request.get('versionNo')), 'disabled': readonly ? true : false, } ) }} From 91cbd039a82b0eecbd7d1ef608d402b72dc19e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20W=C3=B3js?= Date: Sat, 22 Jun 2024 13:27:26 +0200 Subject: [PATCH 2/2] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Paweł Niedzielski --- .../views/themes/admin/ui/field_type/edit/ezimage.html.twig | 4 ++-- .../themes/admin/ui/field_type/edit/ezimageasset.html.twig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimage.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimage.html.twig index 7a16ba78ac..20fb91cdf8 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimage.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimage.html.twig @@ -55,8 +55,8 @@ 'image-edit-actions-after', { 'fieldDefinitionIdentifier' : form.parent.vars.value.fieldDefinition.identifier, - 'contentId' : content_id|default(app.request.get('contentId')), - 'versionNo' : version_no|default(app.request.get('versionNo')), + 'contentId' : content_id ?? app.request.get('contentId'), + 'versionNo' : version_no ?? app.request.get('versionNo'), 'disabled': readonly ? true : false, } ) }} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimageasset.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimageasset.html.twig index 6ac777f371..647d903256 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimageasset.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezimageasset.html.twig @@ -145,8 +145,8 @@ 'image-edit-actions-after', { 'fieldDefinitionIdentifier' : form.parent.vars.value.fieldDefinition.identifier, - 'contentId' : content_id|default(app.request.get('contentId')), - 'versionNo' : version_no|default(app.request.get('versionNo')), + 'contentId' : content_id ?? app.request.get('contentId'), + 'versionNo' : version_no ?? app.request.get('versionNo'), 'disabled': readonly ? true : false, } ) }}