Added enum filter helper override to pass list items

Made default selection work with enum values

Author: programcsharp

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.0.61.0")]
-[assembly: AssemblyFileVersion("1.0.61.0")]
+[assembly: AssemblyVersion("1.0.62.0")]
+[assembly: AssemblyFileVersion("1.0.62.0")]

Griddly.Mvc/Griddly.Mvc.csproj

@@ -115,12 +115,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Griddly.Mvc/GriddlyFilter.cs

@@ -117,7 +117,7 @@ public void SetSelectedItems(object value)
 
                     if (defaultValues == null || value is string)
                     {
-                        string valueString = value.ToString();
+                        string valueString = GetValueString(value);
 
                         foreach (SelectListItem item in SelectableItems)
                             item.Selected = item.Value == valueString;
@@ -128,7 +128,7 @@ public void SetSelectedItems(object value)
                         {
                             if (valueObject != null)
                             {
-                                string valueString = valueObject.ToString();
+                                string valueString = GetValueString(valueObject);
 
                                 foreach (SelectListItem item in SelectableItems.Where(x => x.Value == valueString))
                                     item.Selected = true;
@@ -148,7 +148,16 @@ public void SetSelectedItems(object value)
                         Items[i].Selected = (i == 0);
                 }
             }
+        }
+
+        string GetValueString(object value)
+        {
+            Type valueType = Nullable.GetUnderlyingType(value.GetType()) ?? value.GetType();
 
+            if (valueType.IsEnum)
+                return Convert.ChangeType(value, Enum.GetUnderlyingType(valueType)).ToString();
+            else
+                return value.ToString();
         }
     }
 

Griddly.Mvc/GriddlyFilterExtensions.cs

@@ -114,6 +114,12 @@ public static GriddlyFilterList FilterEnum<T>(this GriddlyColumn column, bool is
             return column.FilterList(Extensions.ToSelectListItems<T>().OrderBy(x => x.Text), isMultiple, defaultSelectAll, nullItemText, isNoneAll, field, caption);
         }
 
+        public static GriddlyFilterList FilterEnum<T>(this GriddlyColumn column, IEnumerable<T> items, bool isMultiple = true, bool defaultSelectAll = true, string nullItemText = null, bool isNoneAll = true, string field = null, string caption = null)
+            where T : struct
+        {
+            return column.FilterList(Extensions.ToSelectListItems(items).OrderBy(x => x.Text), isMultiple, defaultSelectAll, nullItemText, isNoneAll, field, caption);
+        }
+
         public static GriddlyFilterList FilterBool(this GriddlyColumn column, string trueLabel = "Yes", string falseLabel = "No", string nullItemText = null, bool isMultiple = false, bool defaultSelectAll = false, bool isNoneAll = false, string field = null, string caption = null)
         {
             return column.FilterList(BuildBoolItems(trueLabel, falseLabel), isMultiple, defaultSelectAll, nullItemText, isNoneAll, field, caption);

Griddly.Mvc/InternalExtensions.cs

@@ -109,6 +109,26 @@ internal static IEnumerable<SelectListItem> ToSelectListItems<T>()
             }
         }
 
+        internal static IEnumerable<SelectListItem> ToSelectListItems<T>(IEnumerable<T> items)
+            where T : struct
+        {
+            Type enumType = typeof(T);
+
+            if (!enumType.IsEnum)
+                throw new InvalidOperationException("T must be an Enum.");
+
+            foreach (T item in items)
+            {
+                FieldInfo field = enumType.GetField(item.ToString());
+
+                yield return new SelectListItem()
+                {
+                    Value = field.GetValue(null).ToString(),
+                    Text = GetEnumDescription(field)
+                };
+            }
+        }
+
         static string GetEnumDescription(FieldInfo fi)
         {
             if (fi == null)