Lib.Web.Mvc - Work Item #11410

tpeczek · Nov 8, 2011 · 9c15169 · 9c15169
1 parent 551eed8
commit 9c15169
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/Lib.Web.Mvc/JQuery/JqGrid/DataAnnotations/JqGridColumnElementAttribute.cs b/Lib.Web.Mvc/JQuery/JqGrid/DataAnnotations/JqGridColumnElementAttribute.cs
@@ -158,6 +158,15 @@ public bool UrlValidation
             get { return Rules.Url; }
             set { Rules.Url = value; }
         }
+
+        /// <summary>
+        /// Gets or sets the set of value:label pairs for select element.
+        /// </summary>
+        public string Value
+        {
+            get { return Options.Value; }
+            set { Options.Value = value; }
+        }
         #endregion
     }
 }
diff --git a/Lib.Web.Mvc/JQuery/JqGrid/JqGridColumnElementOptions.cs b/Lib.Web.Mvc/JQuery/JqGrid/JqGridColumnElementOptions.cs
@@ -40,6 +40,11 @@ public abstract class JqGridColumnElementOptions
         /// Gets or sets a dictionary where keys should be valid attributes for the element.
         /// </summary>
         public IDictionary<string, object> HtmlAttributes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the set of value:label pairs for select element.
+        /// </summary>
+        public string Value { get; set; }
         #endregion
     }
 }
diff --git a/Lib.Web.Mvc/JQuery/JqGrid/JqGridHelper.cs b/Lib.Web.Mvc/JQuery/JqGrid/JqGridHelper.cs
@@ -391,6 +391,9 @@ private static void AppendElementOptions(JqGridColumnElementOptions elementOptio
 
             if (!String.IsNullOrWhiteSpace(elementOptions.DefaultValue))
                 javaScriptBuilder.AppendFormat("defaultValue: '{0}', ", elementOptions.DefaultValue);
+
+            if (!String.IsNullOrWhiteSpace(elementOptions.Value))
+                javaScriptBuilder.AppendFormat("value: '{0}', ", elementOptions.Value);
         }
 
         private static void AppendColumnRules(string rulesName, JqGridColumnRules rules, ref StringBuilder javaScriptBuilder)

diff --git a/Lib.Web.Mvc/JQuery/JqGrid/Serialization/JqGridScriptConverter.cs b/Lib.Web.Mvc/JQuery/JqGrid/Serialization/JqGridScriptConverter.cs
@@ -521,6 +521,8 @@ private static JqGridColumnEditOptions DeserializeJqGridColumnEditOptions(IDicti
             serializedObj.Remove("dataUrl");
             obj.DefaultValue = GetStringFromSerializedObj(serializedObj, "defaultValue");
             serializedObj.Remove("defaultValue");
+            obj.Value = GetStringFromSerializedObj(serializedObj, "value");
+            serializedObj.Remove("value");
             obj.NullIfEmpty = GetBooleanFromSerializedObj(serializedObj, "NullIfEmpty", false);
             serializedObj.Remove("NullIfEmpty");
             obj.HtmlAttributes = serializedObj;
@@ -874,6 +876,9 @@ private static void SerializeJqGridColumnElementOptions(JqGridColumnElementOptio
 
             if (!String.IsNullOrWhiteSpace(obj.DefaultValue))
                 serializedObj.Add("defaultValue", obj.DefaultValue);
+
+            if (!String.IsNullOrWhiteSpace(obj.Value))
+                serializedObj.Add("value", obj.Value);
         }
 
         private static JqGridColumnSearchOptions DeserializeJqGridColumnSearchOptions(IDictionary<string, object> serializedObj, JavaScriptSerializer serializer)
@@ -882,6 +887,7 @@ private static JqGridColumnSearchOptions DeserializeJqGridColumnSearchOptions(ID
 
             obj.DataUrl = GetStringFromSerializedObj(serializedObj, "dataUrl");
             obj.DefaultValue = GetStringFromSerializedObj(serializedObj, "defaultValue");
+            obj.Value = GetStringFromSerializedObj(serializedObj, "value");
 
             if (serializedObj.ContainsKey("attr") && serializedObj["attr"] != null && serializedObj["attr"] is IDictionary<string, object>)
                 obj.HtmlAttributes = (IDictionary<string, object>)serializedObj["attr"];