Gracefully handle invalid value enums.

programcsharp · May 14, 2015 · 3bf131e · 3bf131e
1 parent 28ea57b
commit 3bf131e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Build/CommonAssemblyInfo.cs b/Build/CommonAssemblyInfo.cs
@@ -15,5 +15,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.5")]
-[assembly: AssemblyFileVersion("1.1.5")]
+[assembly: AssemblyVersion("1.1.6")]
+[assembly: AssemblyFileVersion("1.1.6")]
diff --git a/Griddly.Mvc/GriddlyColumn.cs b/Griddly.Mvc/GriddlyColumn.cs
@@ -45,6 +45,8 @@ public virtual HtmlString RenderValue(object value, bool encode = true)
             else
                 value = value.ToString();
 
+            if (value == null)
+                return null;
             if (value is HtmlString)
                 return (HtmlString)value;
             else if (encode)

diff --git a/Griddly.Mvc/InternalExtensions.cs b/Griddly.Mvc/InternalExtensions.cs
@@ -80,8 +80,10 @@ internal static HtmlString GetHtmlView(string value, bool turnUrlsIntoLinks = fa
 
         internal static string ToStringDescription(Enum value)
         {
-            if (value == null || !Enum.IsDefined(value.GetType(), value))
+            if (value == null)
                 return null;
+            else if (!Enum.IsDefined(value.GetType(), value))
+                return "[Undefined " + value.GetType().Name + " Value: " + value + "]";
 
             return GetEnumDescription(value.GetType().GetField(value.ToString()));
         }