Merge branch '4.5' into main

ibexa · Dec 13, 2023 · cda6806 · cda6806
2 parents 0d7dbde + 5ee3a2b
commit cda6806
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -11016,11 +11016,6 @@ parameters:
 			count: 2
 			path: tests/lib/EventListener/RequestLocaleListenerTest.php
 
-		-
-			message: "#^Call to method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with void will always evaluate to false\\.$#"
-			count: 2
-			path: tests/lib/EventListener/SetViewParametersListenerTest.php
-
 		-
 			message: "#^Method Ibexa\\\\Tests\\\\AdminUi\\\\EventListener\\\\SetViewParametersListenerTest\\:\\:createFieldMock\\(\\) should return Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Field&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject but returns PHPUnit\\\\Framework\\\\MockObject\\\\MockObject&Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
 			count: 1

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
@@ -44,6 +44,7 @@
                         {
                             'fieldDefinitionIdentifier' : form.parent.vars.value.fieldDefinition.identifier,
                             'contentId' : app.request.get('contentId'),
+                            'versionNo' : 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
@@ -124,6 +124,7 @@
                         {
                             'fieldDefinitionIdentifier' : form.parent.vars.value.fieldDefinition.identifier,
                             'contentId' : app.request.get('contentId'),
+                            'versionNo' : app.request.get('versionNo'),
                             'disabled': readonly ? true : false,
                         }
                     ) }}