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

Fixed: #U4-2129 - using new api didn't use the CompositionPropertyTypes instead of just PropertyTypes and fixed up cache invalidation for PublishedContentHelper

Browse Source
This commit is contained in:
Shannon Deminick
2013-04-19 23:47:51 +06:00
parent 671c8715b0
commit 7f5457316a
2 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Umbraco.Core/PublishedContentHelper.cs
View File

@@ -22,37 +22,14 @@ namespace Umbraco.Core
/// </remarks>
internal class PublishedContentHelper : ApplicationEventHandler
{
#region event handlers to ensure that the cache is cleared when content types change
protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
{
ContentTypeService.SavedContentType += ContentTypeServiceSavedContentType;
ContentTypeService.SavedMediaType += ContentTypeServiceSavedMediaType;
ContentTypeService.DeletedContentType += ContentTypeServiceDeletedContentType;
ContentTypeService.DeletedMediaType += ContentTypeServiceDeletedMediaType;
}
static void ContentTypeServiceDeletedMediaType(IContentTypeService sender, Events.DeleteEventArgs<Models.IMediaType> e)
/// <summary>
/// Used to invalidate the cache from the ICacherefresher
/// </summary>
internal static void ClearPropertyTypeCache()
{
PropertyTypeCache.Clear();
}
static void ContentTypeServiceDeletedContentType(IContentTypeService sender, Events.DeleteEventArgs<Models.IContentType> e)
{
PropertyTypeCache.Clear();
}
static void ContentTypeServiceSavedMediaType(IContentTypeService sender, Events.SaveEventArgs<Models.IMediaType> e)
{
PropertyTypeCache.Clear();
}
static void ContentTypeServiceSavedContentType(IContentTypeService sender, Events.SaveEventArgs<Models.IContentType> e)
{
PropertyTypeCache.Clear();
}
#endregion
/// <summary>
/// This callback is used only for unit tests which enables us to return any data we want and not rely on having the data in a database
/// </summary>
@@ -77,11 +54,16 @@ namespace Umbraco.Core
{
var result = applicationContext.Services.ContentTypeService.GetContentType(docTypeAlias);
if (result == null) return Guid.Empty;
if (!result.PropertyTypes.Any(x => x.Alias.InvariantEquals(propertyAlias)))
//SD: we need to check for 'any' here because the collection is backed by KeyValuePair which is a struct
// and can never be null so FirstOrDefault doesn't actually work. Have told Seb and Morten about thsi
// issue.
if (!result.CompositionPropertyTypes.Any(x => x.Alias.InvariantEquals(propertyAlias)))
{
return Guid.Empty;
}
var property = result.PropertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyAlias));
var property = result.CompositionPropertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyAlias));
//as per above, this will never be null but we'll keep the check here anyways.
if (property == null) return Guid.Empty;
return property.DataTypeId;
});

2
src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
View File

@@ -129,6 +129,7 @@ namespace Umbraco.Web.Cache
ApplicationContext.Current.ApplicationCache.ClearCacheByKeySearch(CacheKeys.ContentTypeCacheKey);
//clear static object cache
global::umbraco.cms.businesslogic.ContentType.RemoveAllDataTypeCache();
PublishedContentHelper.ClearPropertyTypeCache();
base.RefreshAll();
}
@@ -247,6 +248,7 @@ namespace Umbraco.Web.Cache
//clears the dictionary object cache of the legacy ContentType
global::umbraco.cms.businesslogic.ContentType.RemoveFromDataTypeCache(payload.Alias);
PublishedContentHelper.ClearPropertyTypeCache();
//need to recursively clear the cache for each child content type
foreach (var descendant in payload.DescendantPayloads)