From 6cc91e43590261d78dc8792bdc205e2fd6484d42 Mon Sep 17 00:00:00 2001 From: Tom Fulton Date: Fri, 4 Apr 2014 17:09:42 -0600 Subject: [PATCH] Move cache keys to Constants --- app/Umbraco/Umbraco.Archetype/Constants.cs | 4 ++++ app/Umbraco/Umbraco.Archetype/Events/ExpireCache.cs | 7 +++++-- .../PropertyConverters/ArchetypeValueConverter.cs | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/Umbraco/Umbraco.Archetype/Constants.cs b/app/Umbraco/Umbraco.Archetype/Constants.cs index 9bc7f0d..83d036b 100644 --- a/app/Umbraco/Umbraco.Archetype/Constants.cs +++ b/app/Umbraco/Umbraco.Archetype/Constants.cs @@ -5,5 +5,9 @@ public const string PropertyEditorAlias = "Imulus.Archetype"; public const string PreValueAlias = "archetypeConfig"; + + public const string CacheKey_DataTypeByGuid = ""; + + public const string CacheKey_PreValueFromDataTypeId = "Archetype_GetArchetypePreValueFromDataTypeId_"; } } diff --git a/app/Umbraco/Umbraco.Archetype/Events/ExpireCache.cs b/app/Umbraco/Umbraco.Archetype/Events/ExpireCache.cs index 96eaced..3db68df 100644 --- a/app/Umbraco/Umbraco.Archetype/Events/ExpireCache.cs +++ b/app/Umbraco/Umbraco.Archetype/Events/ExpireCache.cs @@ -22,8 +22,11 @@ namespace Archetype.Umbraco.Events void ExpirePreValueCache(IDataTypeService sender, global::Umbraco.Core.Events.SaveEventArgs e) { - ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheItem("Archetype_GetArchetypePreValueFromDataTypeId_" + e.SavedEntities.First().Id); - ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheItem("Archetype_GetArchetypePreValueFromDataTypeId_GetPropertyEditorAlias_"+ e.SavedEntities.First().Id); + foreach (var dataType in e.SavedEntities) + { + ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheItem(Constants.CacheKey_PreValueFromDataTypeId + dataType.Id); + ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheItem(Constants.CacheKey_DataTypeByGuid + dataType.Key); + } } } } diff --git a/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs b/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs index 14fa1e5..207056d 100644 --- a/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs +++ b/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs @@ -95,7 +95,7 @@ namespace Archetype.Umbraco.PropertyConverters private ArchetypePreValue GetArchetypePreValueFromDataTypeId(int dataTypeId, IDictionary dataTypeCache) { return ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem( - "Archetype_GetArchetypePreValueFromDataTypeId_" + dataTypeId, + Constants.CacheKey_PreValueFromDataTypeId + dataTypeId, () => { var preValues = Services.DataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeId); @@ -122,7 +122,7 @@ namespace Archetype.Umbraco.PropertyConverters private IDataTypeDefinition GetDataTypeByGuid(Guid guid) { return (IDataTypeDefinition) ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem( - "Archetype_GetDataTypeDefinitionById_" + guid, + Constants.CacheKey_DataTypeByGuid + guid, () => Services.DataTypeService.GetDataTypeDefinitionById(guid)); } }