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

Fixes issue with data type pre-values and using PreValueAsArray when they are dictionary formatted.

Browse Source
This commit is contained in:
Shannon
2014-04-23 22:15:33 +10:00
parent b60ee9944d
commit cefc319bfb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
View File

@@ -354,8 +354,8 @@ AND umbracoNode.id <> @id",
{
//return from the cache
var collection = cached.First();
var preVal = collection.PreValuesAsArray.Single(x => x.Id == preValueId);
return preVal.Value;
var preVal = collection.FormatAsDictionary().Single(x => x.Value.Id == preValueId);
return preVal.Value.Value;
}
l.UpgradeToWriteLock();
@@ -371,8 +371,8 @@ AND umbracoNode.id <> @id",
var preVals = GetAndCachePreValueCollection(dto.DataTypeNodeId);
//return the single value for this id
var pv = preVals.PreValuesAsArray.Single(x => x.Id == preValueId);
return pv.Value;
var pv = preVals.FormatAsDictionary().Single(x => x.Value.Id == preValueId);
return pv.Value.Value;
}
}

2
src/Umbraco.Core/Services/DataTypeService.cs
View File

@@ -124,7 +124,7 @@ namespace Umbraco.Core.Services
{
var collection = repository.GetPreValuesCollectionByDataTypeId(id);
//now convert the collection to a string list
var list = collection.PreValuesAsArray.Select(x => x.Value).ToList();
var list = collection.FormatAsDictionary().Select(x => x.Value.Value).ToList();
return list;
}
}