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 branch '1.9.x' into dev

Browse Source
This commit is contained in:
Sebastien Ros
2016-01-14 13:19:45 -08:00
parent 42923e9642 40db1e2a84
commit 163159dfd0
2 changed files with 8 additions and 4 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); return decimalValue.ToString(CultureInfo.InvariantCulture);
} }
if (type.IsEnum) { var underlyingType = Nullable.GetUnderlyingType(type) ?? type;
if (underlyingType.IsEnum) {
return value.ToString(); return value.ToString();
} }
@@ -275,8 +277,10 @@ namespace Orchard.ContentManagement {
return (T)(object)decimal.Parse(value, CultureInfo.InvariantCulture); return (T)(object)decimal.Parse(value, CultureInfo.InvariantCulture);
} }
if (type.IsEnum) { var underlyingType = Nullable.GetUnderlyingType(type) ?? type;
return (T)Enum.Parse(type, value);
if (underlyingType.IsEnum) {
return (T)Enum.Parse(underlyingType, value);
} }
throw new NotSupportedException(String.Format("Could not handle type {0}", type.Name)); throw new NotSupportedException(String.Format("Could not handle type {0}", type.Name));