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

Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor

Browse Source
This commit is contained in:
Shannon
2015-06-25 10:23:33 +02:00
parent da7b0e34d2 f8beb5ec3f
commit 3c04f43abc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,7 +116,7 @@ namespace Umbraco.Web.Editors
[UmbracoTreeAuthorize(Constants.Trees.DataTypes, Constants.Trees.Content, Constants.Trees.Media)]
public IDictionary<string, List<DataTypeBasic>> GetAllDataTypesAndEditors()
public IDictionary<string, IEnumerable<DataTypeBasic>> GetAllDataTypesAndEditors()
{
var datadefs = Services.DataTypeService
.GetAllDataTypeDefinitions();
@@ -130,7 +130,7 @@ namespace Umbraco.Web.Editors
foreach (var unusedEditor in editors)
datatypes.Add(Mapper.Map<DataTypeBasic>(unusedEditor));
var grouped = datatypes.GroupBy(x => x.Group.ToLower()).ToDictionary(group => group.Key, group => group.ToList());
var grouped = datatypes.GroupBy(x => x.Group.ToLower()).ToDictionary(group => group.Key, group => group.AsEnumerable());
return grouped;
}