lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #6249 from OrchardCMS/issue/infoset-nullable-enums

Browse Source 
Added handling of nullable enums.
This commit is contained in:
Sébastien Ros
2016-01-14 12:14:16 -08:00
parent e907334b6c 64d8c1a16f
commit eb6f2f2752
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Orchard/ContentManagement/XmlHelper.cs
View File

@@ -214,7 +214,9 @@ namespace Orchard.ContentManagement {
return decimalValue.ToString(CultureInfo.InvariantCulture);
}
if (type.IsEnum) {
var underlyingType = Nullable.GetUnderlyingType(type) ?? type;
if (underlyingType.IsEnum) {
return value.ToString();
}
@@ -275,8 +277,10 @@ namespace Orchard.ContentManagement {
return (T)(object)decimal.Parse(value, CultureInfo.InvariantCulture);
}
if (type.IsEnum) {
return (T)Enum.Parse(type, value);
var underlyingType = Nullable.GetUnderlyingType(type) ?? type;
if (underlyingType.IsEnum) {
return (T)Enum.Parse(underlyingType, value);
}
throw new NotSupportedException(String.Format("Could not handle type {0}", type.Name));