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

Fixes up issues reported on review and adds a null check

Browse Source
This commit is contained in:
Shannon
2017-02-03 11:49:22 +11:00
parent a03e0dfb53
commit db86f6e1ee
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Umbraco.Web/Editors/EntityController.cs
View File

@@ -329,13 +329,15 @@ namespace Umbraco.Web.Editors
}
/// <summary>
/// Get entities by string ids - will try to convert to the correct id type (int, guid, udi)
/// Get entities by UDIs
/// </summary>
/// <param name="ids"></param>
/// <param name="ids">
/// A list of UDIs to lookup items by, all UDIs must be of the same UDI type!
/// </param>
/// <param name="type"></param>
/// <returns></returns>
/// <remarks>
/// We allow for POST because there could be quite a lot of Ids
/// We allow for POST because there could be quite a lot of Ids.
/// </remarks>
[HttpGet]
[HttpPost]
@@ -357,7 +359,7 @@ namespace Umbraco.Web.Editors
var guidUdi = ids[0] as GuidUdi;
if (guidUdi != null)
{
return GetResultForKeys(ids.Select(x => ((GuidUdi)x).Guid), type);
return GetResultForKeys(ids.Select(x => ((GuidUdi)x).Guid).ToArray(), type);
}
throw new HttpResponseException(HttpStatusCode.NotFound);
@@ -759,21 +761,21 @@ namespace Umbraco.Web.Editors
}
}
private IEnumerable<EntityBasic> GetResultForKeys(IEnumerable<Guid> keys, UmbracoEntityTypes entityType)
private IEnumerable<EntityBasic> GetResultForKeys(Guid[] keys, UmbracoEntityTypes entityType)
{
var keysArray = keys.ToArray();
if (keysArray.Any() == false) return Enumerable.Empty<EntityBasic>();
if (keys.Length == 0)
return Enumerable.Empty<EntityBasic>();
var objectType = ConvertToObjectType(entityType);
if (objectType.HasValue)
{
var entities = Services.EntityService.GetAll(objectType.Value, keysArray)
var entities = Services.EntityService.GetAll(objectType.Value, keys)
.WhereNotNull()
.Select(Mapper.Map<EntityBasic>);
// entities are in "some" order, put them back in order
var xref = entities.ToDictionary(x => x.Key);
var result = keysArray.Select(x => xref.ContainsKey(x) ? xref[x] : null).Where(x => x != null);
var result = keys.Select(x => xref.ContainsKey(x) ? xref[x] : null).Where(x => x != null);
return result;
}
@@ -791,21 +793,21 @@ namespace Umbraco.Web.Editors
}
}
private IEnumerable<EntityBasic> GetResultForIds(IEnumerable<int> ids, UmbracoEntityTypes entityType)
private IEnumerable<EntityBasic> GetResultForIds(int[] ids, UmbracoEntityTypes entityType)
{
var idsArray = ids.ToArray();
if (idsArray.Any() == false) return Enumerable.Empty<EntityBasic>();
if (ids.Length == 0)
return Enumerable.Empty<EntityBasic>();
var objectType = ConvertToObjectType(entityType);
if (objectType.HasValue)
{
var entities = Services.EntityService.GetAll(objectType.Value, idsArray)
var entities = Services.EntityService.GetAll(objectType.Value, ids)
.WhereNotNull()
.Select(Mapper.Map<EntityBasic>);
// entities are in "some" order, put them back in order
var xref = entities.ToDictionary(x => x.Id);
var result = idsArray.Select(x => xref.ContainsKey(x) ? xref[x] : null).Where(x => x != null);
var result = ids.Select(x => xref.ContainsKey(x) ? xref[x] : null).Where(x => x != null);
return result;
}

2
src/Umbraco.Web/Editors/ParameterSwapControllerActionSelector.cs
View File

@@ -48,7 +48,7 @@ namespace Umbraco.Web.Editors
return method;
}
//if it's a post we can try to read from the body and bind from th
//if it's a post we can try to read from the body and bind from the json value
if (controllerContext.Request.Method == HttpMethod.Post)
{
var requestContent = new HttpMessageContent(controllerContext.Request);

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

@@ -11,6 +11,8 @@ namespace Umbraco.Web.Models.Mapping
{
protected override Udi ResolveCore(IContentTypeComposition source)
{
if (source == null) return null;
return Udi.Create(
source.GetType() == typeof(IMemberType)
? Constants.UdiEntityType.MemberType

2
src/UmbracoExamine/UmbracoContentIndexer.cs
View File

@@ -775,7 +775,7 @@ namespace UmbracoExamine
fields.Add(NodeTypeAliasFieldName, allValuesForIndexing[NodeTypeAliasFieldName]);
//guid
if (allValuesForIndexing[IconFieldName].IsNullOrWhiteSpace() == false)
if (allValuesForIndexing[NodeKeyFieldName].IsNullOrWhiteSpace() == false)
{
fields.Add(NodeKeyFieldName, allValuesForIndexing[NodeKeyFieldName]);
}