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

Simplified the merging of property editors VS types

Browse Source
This commit is contained in:
Per Ploug Krogslund
2015-08-11 11:51:49 +02:00
parent 1ff7b34b86
commit fc565fbae2
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Umbraco.Web/Editors/DataTypeController.cs
View File

@@ -278,16 +278,33 @@ namespace Umbraco.Web.Editors
[UmbracoTreeAuthorize(
Constants.Applications.Content, Constants.Applications.Media, Constants.Applications.Members,
Constants.Applications.Settings, Constants.Applications.Developer)]
public IDictionary<string, IEnumerable<DataTypeBasic>> GetAllDataTypesAndEditors()
public IDictionary<string, IEnumerable<DataTypeBasic>> GetGroupedPropertyEditors()
{
var datadefs = Services.DataTypeService
.GetAllDataTypeDefinitions();
var editors = PropertyEditorResolver.Current.PropertyEditors.Where(x => datadefs.Any(y => y.PropertyEditorAlias == x.Alias) == false);
.GetAllDataTypeDefinitions()
.ToArray();
var datatypes = datadefs.Select(Mapper.Map<DataTypeBasic>).ToList();
var datatypes = new List<DataTypeBasic>();
datatypes.AddRange(editors.Select(Mapper.Map<DataTypeBasic>));
//this is a very specific map - if a property editor does not have prevalue - and there is a datatype already using this type, return that.
var propertyEditors = PropertyEditorResolver.Current.PropertyEditors;
foreach (var propertyEditor in propertyEditors)
{
var hasPrevalues = propertyEditor.PreValueEditor.Fields.Any();
//if no prevalues and a datatype available
if(hasPrevalues == false && datadefs.Any(x => x.PropertyEditorAlias == propertyEditor.Alias))
{
datatypes.Add( Mapper.Map<DataTypeBasic>( datadefs.First(x => x.PropertyEditorAlias == propertyEditor.Alias) ));
}else{
//else, just add a clean property editor
var basic = Mapper.Map<DataTypeBasic>(propertyEditor);
basic.HasPrevalues = hasPrevalues;
datatypes.Add(basic);
}
}
var grouped = datatypes
.GroupBy(x => x.Group.IsNullOrWhiteSpace() ? "" : x.Group.ToLower())
.ToDictionary(group => group.Key, group => group.AsEnumerable());