ModelState.ToSerializableDictionary now handles multiple error keys. F…

…ixes #15.
benfoster · Mar 6, 2013 · 51d5232 · 51d5232
1 parent 0d5e04c
commit 51d5232
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/Fabrik.Common.Web/ModelStateExtensions.cs b/src/Fabrik.Common.Web/ModelStateExtensions.cs
@@ -7,17 +7,14 @@ namespace Fabrik.Common.Web
     public static class ModelStateExtensions
     {
         /// <summary>
-        /// Converts the <paramref name="modelState"/> to a string dictionary that can be easily serialized.
+        /// Converts the <paramref name="modelState"/> to a dictionary that can be easily serialized.
         /// </summary>
-        public static IDictionary<string, string> ToSerializableDictionary(this ModelStateDictionary modelState)
+        public static IDictionary<string, string[]> ToSerializableDictionary(this ModelStateDictionary modelState)
         {
-            Ensure.Argument.NotNull(modelState, "modelState");
+            return modelState.Where(x => x.Value.Errors.Any()).ToDictionary(
-
+                kvp => kvp.Key,
-            var dictionary = (from k in modelState.Keys
+                kvp => kvp.Value.Errors.Select(e => e.ErrorMessage).ToArray()
-                              from e in modelState[k].Errors
+            );
-                              select new { k, e.ErrorMessage }).ToDictionary(x => x.k, x => x.ErrorMessage);
-
-            return dictionary;
         }
     }
 }