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

Merge pull request #2533 from ronaldbarendse/U4-10586

Browse Source 
Added property editor alias to PreValueDisplayResolver warning
This commit is contained in:
Sebastiaan Janssen
2018-09-26 23:03:57 +02:00
committed by GitHub
parent ca8c6248c1 477761a81a
commit 85291b562e
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Models/Mapping/DataTypeModelMapper.cs
View File

@@ -116,7 +116,7 @@ namespace Umbraco.Web.Models.Mapping
var fields = editor.PreValueEditor.Fields.Select(Mapper.Map<PreValueFieldDisplay>).ToArray();
if (defaultVals != null)
{
PreValueDisplayResolver.MapPreValueValuesToPreValueFields(fields, defaultVals);
PreValueDisplayResolver.MapPreValueValuesToPreValueFields(fields, defaultVals, editor.Alias);
}
return fields;
});

36
src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
View File

@@ -18,27 +18,31 @@ namespace Umbraco.Web.Models.Mapping
public PreValueDisplayResolver(IDataTypeService dataTypeService)
{
_dataTypeService = dataTypeService;
}
}
/// <summary>
/// Maps pre-values in the dictionary to the values for the fields
/// Maps pre-values in the dictionary to the values for the fields.
/// </summary>
/// <param name="fields"></param>
/// <param name="preValues"></param>
internal static void MapPreValueValuesToPreValueFields(PreValueFieldDisplay[] fields, IDictionary<string, object> preValues)
/// <param name="fields">The fields.</param>
/// <param name="preValues">The pre-values.</param>
/// <param name="editorAlias">The editor alias.</param>
internal static void MapPreValueValuesToPreValueFields(PreValueFieldDisplay[] fields, IDictionary<string, object> preValues, string editorAlias)
{
if (fields == null) throw new ArgumentNullException("fields");
if (preValues == null) throw new ArgumentNullException("preValues");
//now we need to wire up the pre-values values with the actual fields defined
if (fields == null) throw new ArgumentNullException(nameof(fields));
if (preValues == null) throw new ArgumentNullException(nameof(preValues));
// Now we need to wire up the pre-values values with the actual fields defined
foreach (var field in fields)
{
var found = preValues.Any(x => x.Key.InvariantEquals(field.Key));
if (found == false)
// If the dictionary would be constructed with StringComparer.InvariantCultureIgnoreCase, we could just use TryGetValue
var preValue = preValues.SingleOrDefault(x => x.Key.InvariantEquals(field.Key));
if (preValue.Key == null)
{
LogHelper.Warn<PreValueDisplayResolver>("Could not find persisted pre-value for field " + field.Key);
LogHelper.Warn<PreValueDisplayResolver>("Could not find persisted pre-value for field {0} on property editor {1}", () => field.Key, () => editorAlias);
continue;
}
field.Value = preValues.Single(x => x.Key.InvariantEquals(field.Key)).Value;
field.Value = preValue.Value;
}
}
@@ -54,20 +58,20 @@ namespace Umbraco.Web.Models.Mapping
}
}
//set up the defaults
// Set up the defaults
var dataTypeService = _dataTypeService;
var preVals = dataTypeService.GetPreValuesCollectionByDataTypeId(source.Id);
IDictionary<string, object> dictionaryVals = preVals.FormatAsDictionary().ToDictionary(x => x.Key, x => (object)x.Value);
var result = Enumerable.Empty<PreValueFieldDisplay>().ToArray();
//if we have a prop editor, then format the pre-values based on it and create it's fields.
// If we have a prop editor, then format the pre-values based on it and create it's fields
if (propEd != null)
{
result = propEd.PreValueEditor.Fields.Select(Mapper.Map<PreValueFieldDisplay>).ToArray();
dictionaryVals = propEd.PreValueEditor.ConvertDbToEditor(propEd.DefaultPreValues, preVals);
}
MapPreValueValuesToPreValueFields(result, dictionaryVals);
MapPreValueValuesToPreValueFields(result, dictionaryVals, source.PropertyEditorAlias);
return result;
}