Lib.Web.Mvc - Bug Fixes

tpeczek · Mar 25, 2011 · 4bdfdb0 · 4bdfdb0
1 parent 9595571
commit 4bdfdb0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Lib.Web.Mvc/JQuery/JqGrid/DataAnnotations/JqGridColumnEditableAttribute.cs b/Lib.Web.Mvc/JQuery/JqGrid/DataAnnotations/JqGridColumnEditableAttribute.cs
@@ -208,6 +208,7 @@ public JqGridColumnEditableAttribute(bool editable)
             EditOptions = new JqGridColumnEditOptions();
             EditRules = new JqGridColumnEditRules();
             EditType = JqGridColumnEditTypes.Text;
+            FormOptions = new JqGridColumnFormOptions();
         }
 
         /// <summary>

diff --git a/Lib.Web.Mvc/JQuery/JqGrid/JqGridColumnModel.cs b/Lib.Web.Mvc/JQuery/JqGrid/JqGridColumnModel.cs
@@ -165,8 +165,6 @@ internal JqGridColumnModel(ModelMetadata propertyMetadata)
                 Sortable = columnSortableAttribute.Sortable;
                 Index = columnSortableAttribute.Index;
             }
-            else
-                Index = propertyMetadata.PropertyName;
 
             JqGridColumnSearchableAttribute columnSearchableAttribute = customAttributes.OfType<JqGridColumnSearchableAttribute>().FirstOrDefault();
             if (columnSearchableAttribute != null)
@@ -191,6 +189,7 @@ internal JqGridColumnModel(ModelMetadata propertyMetadata)
                     EditOptions = columnEditableAttribute.EditOptions;
                     EditRules = columnEditableAttribute.EditRules;
                     EditType = columnEditableAttribute.EditType;
+                    FormOptions = columnEditableAttribute.FormOptions;
 
                     if ((propertyMetadata.ModelType == typeof(Int16)) || (propertyMetadata.ModelType == typeof(Int32)) || (propertyMetadata.ModelType == typeof(Int64)) || (propertyMetadata.ModelType == typeof(UInt16)) || (propertyMetadata.ModelType == typeof(UInt32)) || (propertyMetadata.ModelType == typeof(UInt32)))
                         EditRules.Integer = true;
@@ -219,6 +218,9 @@ internal JqGridColumnModel(ModelMetadata propertyMetadata)
 
             Name = propertyMetadata.PropertyName;
 
+            if (String.IsNullOrWhiteSpace(Index))
+                Index = propertyMetadata.PropertyName;
+
             if (!String.IsNullOrWhiteSpace(propertyMetadata.TemplateHint) && propertyMetadata.TemplateHint.Equals("HiddenInput"))
                 Hidden = true;
             else

diff --git a/Lib.Web.Mvc/JQuery/JqGrid/JqGridHelper.cs b/Lib.Web.Mvc/JQuery/JqGrid/JqGridHelper.cs
@@ -676,7 +676,7 @@ private static void AppendNavigatorActionOptions(JqGridNavigatorActionOptions ac
                     javaScriptBuilder.AppendFormat("modal: {0},", actionOptions.Modal.Value.ToString().ToLower());
 
                 if (actionOptions.MethodType.HasValue)
-                    javaScriptBuilder.AppendFormat("mtype: {0},", actionOptions.MethodType.Value.ToString().ToUpper());
+                    javaScriptBuilder.AppendFormat("mtype: '{0}',", actionOptions.MethodType.Value.ToString().ToUpper());
 
                 if (!String.IsNullOrWhiteSpace(actionOptions.OnClose))
                     javaScriptBuilder.AppendFormat("onClose: '{0}',", actionOptions.OnClose);