yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed up the media uploader property editor so that it doesn't store any json, this leaves it as fully backwards compatible with 6.x < but also still allows us to upload multiple images if we want.

Browse Source
This commit is contained in:
Shannon
2013-07-23 16:43:08 +10:00
parent 5aeac564cb
commit 53891a69af
9 changed files with 96 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web/Editors/BackOfficeController.cs
View File

@@ -66,7 +66,8 @@ namespace Umbraco.Web.Editors
{
"umbracoSettings", new Dictionary<string, object>
{
{"umbracoPath", GlobalSettings.Path}
{"umbracoPath", GlobalSettings.Path},
{"imageFileTypes", UmbracoSettings.ImageFileTypes},
}
},
{ "isDebuggingEnabled", HttpContext.IsDebuggingEnabled }

50
src/Umbraco.Web/PropertyEditors/FileUploadValueEditor.cs
View File

@@ -6,6 +6,7 @@ using System.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Core.Media;
using Umbraco.Core.Models.Editors;
using Umbraco.Core.PropertyEditors;
@@ -45,32 +46,30 @@ namespace Umbraco.Web.PropertyEditors
//check the editorValue value to see if we need to clear the files or not
var clear = false;
if (editorValue.Value.IsNullOrWhiteSpace() == false)
{
var parsed = JObject.Parse(editorValue.Value);
clear = parsed["clearFiles"].Value<bool>();
}
//parse the current value
var currentPersistedValues = new JArray();
if (currentValue != null)
{
try
{
currentPersistedValues = JArray.Parse(currentValue.ToString());
var parsed = JObject.Parse(editorValue.Value);
clear = parsed["clearFiles"].Value<bool>();
}
catch (JsonReaderException)
{
//if we cannot parse, we'll ignore the error and start again, there must be a bad value stored for some reason
clear = false;
}
}
var newValue = new JArray();
var currentPersistedValues = new string[] {};
if (currentValue != null)
{
currentPersistedValues = currentValue.ToString().Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries);
}
var newValue = new List<string>();
if (clear)
{
//TODO: Need to delete our old files!
return newValue.ToString(Formatting.None);
return "";
}
//check for any files
@@ -87,8 +86,8 @@ namespace Umbraco.Web.PropertyEditors
{
var file = filesAsArray[i];
var currentPersistedFile = currentPersistedValues.Count >= (i + 1)
? currentPersistedValues[i]["file"].ToString()
var currentPersistedFile = currentPersistedValues.Length >= (i + 1)
? currentPersistedValues[i]
: "";
var name = IOHelper.SafeFileName(file.FileName.Substring(file.FileName.LastIndexOf(IOHelper.DirSepChar) + 1, file.FileName.Length - file.FileName.LastIndexOf(IOHelper.DirSepChar) - 1).ToLower());
@@ -110,18 +109,8 @@ namespace Umbraco.Web.PropertyEditors
{
var umbracoFile = UmbracoFile.Save(fileStream, fileName);
//create json to be saved
var forPersisting = JObject.FromObject(new
{
file = umbracoFile.Url,
isImage = false
});
if (umbracoFile.SupportsResizing)
{
forPersisting["isImage"] = true;
// make default thumbnail
umbracoFile.Resize(100, "thumb");
@@ -137,23 +126,22 @@ namespace Umbraco.Web.PropertyEditors
}
}
}
//add this to the persisted values
newValue.Add(forPersisting);
newValue.Add(umbracoFile.Url);
}
//now remove the temp file
File.Delete(file.TempFilePath);
File.Delete(file.TempFilePath);
}
//TODO: We need to remove any files that were previously persisted but are no longer persisted. FOr example, if we
// uploaded 5 files before and then only uploaded 3, then the last two should be deleted.
return newValue.ToString(Formatting.None);
return string.Join(",", newValue);
}
}
//if we've made it here, we had no files to save and we were not clearing anything so just persist the same value we had before
return currentValue;
}
}
}