swcs/Archetype
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #400 from kjac/fix-upload-and-image-cropper-again

Browse Source 
Fix upload and image cropper (again)
This commit is contained in:
Kenn Jacobsen
2017-06-07 17:48:23 +02:00
committed by GitHub
parent d816103981 4c7496840d
commit 2a6d5eaddf
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs
+7 -1
View File
@@ -206,7 +206,13 @@ namespace Archetype.PropertyEditors
else if (propDef.EditorState != null && propDef.EditorState.FileNames != null && propDef.EditorState.FileNames.Any())
{
// pass the uploaded files that belongs to this property (if any) to the value editor
var propertyFiles = propDef.EditorState.FileNames.Select(f => uploadedFiles.FirstOrDefault(u => u.FileName != null && u.FileName.Equals(f, StringComparison.OrdinalIgnoreCase))).Where(f => f != null).ToList();
var propertyFiles = propDef.EditorState.FileNames.Select(fileName =>
uploadedFiles.FirstOrDefault(u => u.FileName != null &&
// #384, #389 and #394 - look for "safe" file names (using the ToSafeFileName() extension)
// - for backwards compatibility we'll look for the raw filename as well as the "safe" file name
(u.FileName.Equals(fileName, StringComparison.OrdinalIgnoreCase) || u.FileName.Equals(fileName.ToSafeFileName(), StringComparison.OrdinalIgnoreCase))
)
).Where(f => f != null).ToList();
if(propertyFiles.Any())
{
additionalData["files"] = propertyFiles;