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

Merge branch '7.1_U4-4447' of https://github.com/arknu/Umbraco-CMS into arknu-7.1_U4-4447

Browse Source 
Conflicts:
	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
This commit is contained in:
Shannon
2014-03-20 13:10:39 +11:00
parent af9a9a9a7a c565744a9b
commit 2792937b17
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
View File

@@ -65,7 +65,7 @@ namespace Umbraco.Web.PropertyEditors
static void AutoFillProperties(IContentBase model)
{
foreach (var p in model.Properties)
foreach (var p in model.Properties.Where(x => x.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.UploadFieldAlias))
{
var uploadFieldConfigNode =
UmbracoConfig.For.UmbracoSettings().Content.ImageAutoFillProperties

36
src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
View File

@@ -62,7 +62,7 @@ namespace Umbraco.Web.PropertyEditors
static void AutoFillProperties(IContentBase model)
{
foreach (var p in model.Properties.Where(x => x.PropertyType.Alias == Constants.PropertyEditors.ImageCropperAlias))
foreach (var p in model.Properties.Where(x => x.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.ImageCropperAlias))
{
var uploadFieldConfigNode =
UmbracoConfig.For.UmbracoSettings().Content.ImageAutoFillProperties
@@ -70,18 +70,30 @@ namespace Umbraco.Web.PropertyEditors
if (uploadFieldConfigNode != null)
{
if (p.Value != null){
var json = p.Value as JObject;
if (json != null && json["src"] != null)
model.PopulateFileMetaDataProperties(uploadFieldConfigNode, json["src"].Value<string>());
else if (p.Value is string)
{
var config = ApplicationContext.Current.Services.DataTypeService.GetPreValuesByDataTypeId(p.PropertyType.DataTypeDefinitionId).FirstOrDefault();
if (p.Value != null)
{
JObject json = null;
try
{
json = JObject.Parse((string)p.Value);
}
catch (Newtonsoft.Json.JsonException ex)
{
}
if (json != null && json["src"] != null)
model.PopulateFileMetaDataProperties(uploadFieldConfigNode, json["src"].Value<string>());
else if (p.Value is string)
{
var src = p.Value;
var config = ApplicationContext.Current.Services.DataTypeService.GetPreValuesByDataTypeId(p.PropertyType.DataTypeDefinitionId).FirstOrDefault();
var crops = string.IsNullOrEmpty(config) == false ? config : "[]";
p.Value = "{src: '" + p.Value + "', crops: " + crops + "}";
model.PopulateFileMetaDataProperties(uploadFieldConfigNode, p.Value == null ? string.Empty : p.Value.ToString());
}
}else
p.Value = "{src: '" + p.Value + "', crops: " + crops + "}";
//Only provide the source path, not the whole JSON value
model.PopulateFileMetaDataProperties(uploadFieldConfigNode, src);
}
}
else
model.ResetFileMetaDataProperties(uploadFieldConfigNode);
}
}