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

Fixes some null checks and updates a member test

Browse Source
This commit is contained in:
Shannon
2014-09-02 13:18:35 +10:00
parent 42fe4c77f6
commit 34699dc4e1
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
View File

@@ -560,11 +560,14 @@ AND umbracoNode.id <> @id",
var contentTypes = MapContentTypes(contentTypeIds, db, out allAssociatedTemplates, out allParentContentTypeIds)
.ToArray();
MapContentTypeTemplates(
contentTypes, db, contentTypeRepository, templateRepository, allAssociatedTemplates);
if (contentTypes.Any())
{
MapContentTypeTemplates(
contentTypes, db, contentTypeRepository, templateRepository, allAssociatedTemplates);
MapContentTypeChildren(
contentTypes, db, contentTypeRepository, allParentContentTypeIds);
MapContentTypeChildren(
contentTypes, db, contentTypeRepository, allParentContentTypeIds);
}
return contentTypes;
}
@@ -590,24 +593,29 @@ AND umbracoNode.id <> @id",
//NOTE: SQL call #3++
var allParentIdsAsArray = allParentContentTypeIds.SelectMany(x => x.Value).Distinct().ToArray();
if (allParentIdsAsArray.Any())
if (allParentContentTypeIds != null)
{
var allParentContentTypes = contentTypeRepository.GetAll(allParentIdsAsArray).ToArray();
foreach (var contentType in contentTypes)
var allParentIdsAsArray = allParentContentTypeIds.SelectMany(x => x.Value).Distinct().ToArray();
if (allParentIdsAsArray.Any())
{
var parentContentTypes = allParentContentTypes.Where(x => allParentContentTypeIds[contentType.Id].Contains(x.Id));
foreach (var parentContentType in parentContentTypes)
var allParentContentTypes = contentTypeRepository.GetAll(allParentIdsAsArray).ToArray();
foreach (var contentType in contentTypes)
{
var result = contentType.AddContentType(parentContentType);
//Do something if adding fails? (Should hopefully not be possible unless someone created a circular reference)
}
var parentContentTypes = allParentContentTypes.Where(x => allParentContentTypeIds[contentType.Id].Contains(x.Id));
foreach (var parentContentType in parentContentTypes)
{
var result = contentType.AddContentType(parentContentType);
//Do something if adding fails? (Should hopefully not be possible unless someone created a circular reference)
}
//on initial construction we don't want to have dirty properties tracked
// http://issues.umbraco.org/issue/U4-1946
((Entity)contentType).ResetDirtyProperties(false);
//on initial construction we don't want to have dirty properties tracked
// http://issues.umbraco.org/issue/U4-1946
((Entity)contentType).ResetDirtyProperties(false);
}
}
}
}
internal static void MapContentTypeTemplates<TRepo>(IContentType[] contentTypes,
@@ -617,6 +625,8 @@ AND umbracoNode.id <> @id",
IDictionary<int, IEnumerable<AssociatedTemplate>> associatedTemplates)
where TRepo : IRepositoryQueryable<int, TEntity>
{
if (associatedTemplates == null || associatedTemplates.Any() == false) return;
//NOTE: SQL call #3++
//SEE: http://issues.umbraco.org/issue/U4-5174 to fix this

4
src/Umbraco.Tests/Services/MemberTypeServiceTests.cs
View File

@@ -162,8 +162,8 @@ namespace Umbraco.Tests.Services
contentType1.RemovePropertyType(alias);
ServiceContext.MemberTypeService.Save(contentType1);
var reQueried = ServiceContext.ContentTypeService.GetContentType(contentType1.Id);
var reContent = ServiceContext.ContentService.GetById(contentItems1.First().Id);
var reQueried = ServiceContext.MemberTypeService.Get(contentType1.Id);
var reContent = ServiceContext.MemberService.GetById(contentItems1.First().Id);
foreach (var c in contentItems1)
{