Skip to content

Commit e9450ac

Browse files
committed
Remove enum conversion to number to use string value by default
1 parent cb0b676 commit e9450ac

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

Build/CommonAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
//
1616
// You can specify all the values or you can default the Revision and Build Numbers
1717
// by using the '*' as shown below:
18-
[assembly: AssemblyVersion("1.0.62.0")]
19-
[assembly: AssemblyFileVersion("1.0.62.0")]
18+
[assembly: AssemblyVersion("1.0.63.0")]
19+
[assembly: AssemblyFileVersion("1.0.63.0")]

Griddly.Mvc/GriddlyFilter.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
using System.Collections.Generic;
44
using System.Data.Entity.Design.PluralizationServices;
55
using System.Globalization;
6-
using System.Web.Mvc;
76
using System.Linq;
7+
using System.Web.Mvc;
88

99
namespace Griddly.Mvc
1010
{
@@ -117,7 +117,7 @@ public void SetSelectedItems(object value)
117117

118118
if (defaultValues == null || value is string)
119119
{
120-
string valueString = GetValueString(value);
120+
string valueString = value.ToString();// GetValueString(value);
121121

122122
foreach (SelectListItem item in SelectableItems)
123123
item.Selected = item.Value == valueString;
@@ -128,7 +128,7 @@ public void SetSelectedItems(object value)
128128
{
129129
if (valueObject != null)
130130
{
131-
string valueString = GetValueString(valueObject);
131+
string valueString = valueObject.ToString();// GetValueString(valueObject);
132132

133133
foreach (SelectListItem item in SelectableItems.Where(x => x.Value == valueString))
134134
item.Selected = true;
@@ -150,15 +150,15 @@ public void SetSelectedItems(object value)
150150
}
151151
}
152152

153-
string GetValueString(object value)
154-
{
155-
Type valueType = Nullable.GetUnderlyingType(value.GetType()) ?? value.GetType();
153+
//string GetValueString(object value)
154+
//{
155+
// Type valueType = Nullable.GetUnderlyingType(value.GetType()) ?? value.GetType();
156156

157-
if (valueType.IsEnum)
158-
return Convert.ChangeType(value, Enum.GetUnderlyingType(valueType)).ToString();
159-
else
160-
return value.ToString();
161-
}
157+
// if (valueType.IsEnum)
158+
// return Convert.ChangeType(value, Enum.GetUnderlyingType(valueType)).ToString();
159+
// else
160+
// return value.ToString();
161+
//}
162162
}
163163

164164
public enum FilterDataType

0 commit comments

Comments
 (0)