swcs/Archetype
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '91' into feature/cache

Browse Source 
Conflicts:
	app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs

Fix conflicts and update caching to match #91
This commit is contained in:
Tom Fulton
2014-04-03 22:48:29 -06:00
parent f138ee178b 6ce31efc27
commit 3ffd03e34c
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
+7 -14
View File
@@ -69,7 +69,9 @@ namespace Archetype.Umbraco.PropertyConverters
var propertyAlias = property.Alias;
foreach (var propertyInst in fieldsetInst.Properties.Where(x => x.Alias == propertyAlias))
{
propertyInst.DataTypeId = GetDataTypeByGuid(property.DataTypeGuid, dataTypeCache).Id;
propertyInst.DataTypeId = (int)ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem(
"Archetype_ConvertDataToSource_GetDataTypeDefinitionByGuid_" + property.DataTypeGuid,
() => Services.DataTypeService.GetDataTypeDefinitionById(property.DataTypeGuid));
propertyInst.PropertyEditorAlias = property.PropertyEditorAlias;
}
}
@@ -104,23 +106,14 @@ namespace Archetype.Umbraco.PropertyConverters
foreach (var fieldset in config.Fieldsets)
{
foreach (var property in fieldset.Properties)
{
property.PropertyEditorAlias = GetDataTypeByGuid(property.DataTypeGuid, dataTypeCache).PropertyEditorAlias;
{
property.PropertyEditorAlias = ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem(
"Archetype_GetArchetypePreValueFromDataTypeId_GetPropertyEditorAlias_" + property.DataTypeGuid,
() => Services.DataTypeService.GetDataTypeDefinitionById(property.DataTypeGuid).PropertyEditorAlias).ToString();
}
}
return config;
}
private IDataTypeDefinition GetDataTypeByGuid(Guid guid, IDictionary<Guid, IDataTypeDefinition> cache)
{
IDataTypeDefinition dataType;
if (cache.TryGetValue(guid, out dataType))
return dataType;
dataType = Services.DataTypeService.GetDataTypeDefinitionById(guid);
cache[guid] = dataType;
return dataType;
}
}
}