Merge pull request #35 from neos/bugfix-33

markusguenther · web-flow · commit f3e3fcbb9489 · 2025-01-15T11:26:37.000+01:00
BUGFIX: Preventing the Rendering of UploadedResourcePreview
diff --git a/Resources/Private/Fusion/Elements/FileUpload.fusion b/Resources/Private/Fusion/Elements/FileUpload.fusion
@@ -11,6 +11,7 @@ prototype(Neos.Form:FileUpload) < prototype(Neos.Form.FusionRenderer:FormElement
             }
             content = ${elementValue.fileName}
             @if.hasUploadedResource = ${elementValue ? true : false}
+            @if.hasNoValidationErrors = ${!elementHasValidationErrors}
         }
         uploadedResourceHiddenField = Neos.Fusion:Tag {
             @position = 'before field'
diff --git a/Resources/Private/Fusion/Elements/ImageUpload.fusion b/Resources/Private/Fusion/Elements/ImageUpload.fusion
@@ -14,6 +14,7 @@ prototype(Neos.Form:ImageUpload) < prototype(Neos.Form.FusionRenderer:FormElemen
                 maximumWidth = 200
             }
             @if.hasUploadedImage = ${elementValue ? true : false}
+            @if.hasNoValidationErrors = ${!elementHasValidationErrors}
         }
         uploadedImageHiddenField =  Neos.Fusion:Tag {
             @position = 'before field'
@@ -29,6 +30,7 @@ prototype(Neos.Form:ImageUpload) < prototype(Neos.Form.FusionRenderer:FormElemen
             tagName = 'input'
             attributes {
                 type = 'file'
+                accept = ${Neos.Form.FusionRenderer.getAcceptFromAllowedExtensions(element.properties.allowedTypes)}
                 name = ${elementName + '[resource]'}
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ prototype(Neos.Form:FileUpload) < prototype(Neos.Form.FusionRenderer:FormElement`
`11`	`11`	`}`
`12`	`12`	`content = ${elementValue.fileName}`
`13`	`13`	`@if.hasUploadedResource = ${elementValue ? true : false}`
	`14`	`+ @if.hasNoValidationErrors = ${!elementHasValidationErrors}`
`14`	`15`	`}`
`15`	`16`	`uploadedResourceHiddenField = Neos.Fusion:Tag {`
`16`	`17`	`@position = 'before field'`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ prototype(Neos.Form:ImageUpload) < prototype(Neos.Form.FusionRenderer:FormElemen`
`14`	`14`	`maximumWidth = 200`
`15`	`15`	`}`
`16`	`16`	`@if.hasUploadedImage = ${elementValue ? true : false}`
	`17`	`+ @if.hasNoValidationErrors = ${!elementHasValidationErrors}`
`17`	`18`	`}`
`18`	`19`	`uploadedImageHiddenField = Neos.Fusion:Tag {`
`19`	`20`	`@position = 'before field'`
`@@ -29,6 +30,7 @@ prototype(Neos.Form:ImageUpload) < prototype(Neos.Form.FusionRenderer:FormElemen`
`29`	`30`	`tagName = 'input'`
`30`	`31`	`attributes {`
`31`	`32`	`type = 'file'`
	`33`	`+ accept = ${Neos.Form.FusionRenderer.getAcceptFromAllowedExtensions(element.properties.allowedTypes)}`
`32`	`34`	`name = ${elementName + '[resource]'}`
`33`	`35`	`}`
`34`	`36`	`}`