Lib.Web.Mvc - Work Item #11409

tpeczek · Nov 7, 2011 · 551eed8 · 551eed8
1 parent ecfb450
commit 551eed8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/Lib.Web.Mvc/JQuery/JqGrid/JqGridRequestSearchingFilters.cs b/Lib.Web.Mvc/JQuery/JqGrid/JqGridRequestSearchingFilters.cs
@@ -20,6 +20,11 @@ public class JqGridRequestSearchingFilters
         /// Gets the list of filters.
         /// </summary>
         public List<JqGridRequestSearchingFilter> Filters { get; private set; }
+
+        /// <summary>
+        /// Gets the list of filters sub groups.
+        /// </summary>
+        public List<JqGridRequestSearchingFilters> Groups { get; private set; }
         #endregion
 
         #region Constructor
@@ -29,6 +34,7 @@ public class JqGridRequestSearchingFilters
         public JqGridRequestSearchingFilters()
         {
             Filters = new List<JqGridRequestSearchingFilter>();
+            Groups = new List<JqGridRequestSearchingFilters>();
         }
         #endregion
     }

diff --git a/Lib.Web.Mvc/JQuery/JqGrid/Serialization/JqGridScriptConverter.cs b/Lib.Web.Mvc/JQuery/JqGrid/Serialization/JqGridScriptConverter.cs
@@ -1105,6 +1105,17 @@ private static JqGridRequestSearchingFilters DeserializeJqGridRequestSearchingFi
                     }
                 }
             }
+            if (serializedObj.ContainsKey("groups") && serializedObj["groups"] is ArrayList)
+            {
+                foreach (object innerSerializedObj in (ArrayList)serializedObj["groups"])
+                {
+                    if (innerSerializedObj is IDictionary<string, object>)
+                    {
+                        JqGridRequestSearchingFilters searchingFilters = DeserializeJqGridRequestSearchingFilters((IDictionary<string, object>)innerSerializedObj, serializer);
+                        obj.Groups.Add(searchingFilters);
+                    }
+                }
+            }
 
             return obj;
         }