Skip to content

Commit bee2078

Browse files
committed
Do not show "Contains" in griddly filter display.
Reason: This is inaccurate, as some filters' actual behavior will be StartsWith, EndsWith, Equals, or some other algorithm
1 parent a2e5154 commit bee2078

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

Build/CommonAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
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("3.6.25")]
19-
[assembly: AssemblyFileVersion("3.6.25")]
18+
[assembly: AssemblyVersion("3.6.26")]
19+
[assembly: AssemblyFileVersion("3.6.26")]
2020
//[assembly: AssemblyInformationalVersion("2.5-filters")]

Griddly.NetCore.Razor/wwwroot/js/griddly.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,10 +1141,7 @@
11411141

11421142
if (val != null)
11431143
{
1144-
if (dataType == "String")
1145-
display = 'Contains "' + getFormattedValue(val, dataType, this.options.currencySymbol) + '"';
1146-
else
1147-
display = getFormattedValue(val, dataType, this.options.currencySymbol);
1144+
display = getFormattedValue(val, dataType, this.options.currencySymbol);
11481145
}
11491146

11501147
if (display == null)
@@ -1235,7 +1232,7 @@
12351232
this.triggerOrQueue(this.$element, "filterchange.griddly", this.$element, event.target);
12361233
}, this));
12371234

1238-
$(".griddly-filters-inline .filter-content input", this.$element).keyup($.proxy(function (event, a, b)
1235+
$(".griddly-filters-inline .filter-content input", this.$element).keyup($.proxy(function (event)
12391236
{
12401237
if (event.which == 13)
12411238
{

Griddly/Scripts/griddly.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,10 +1141,7 @@
11411141

11421142
if (val != null)
11431143
{
1144-
if (dataType == "String")
1145-
display = 'Contains "' + getFormattedValue(val, dataType, this.options.currencySymbol) + '"';
1146-
else
1147-
display = getFormattedValue(val, dataType, this.options.currencySymbol);
1144+
display = getFormattedValue(val, dataType, this.options.currencySymbol);
11481145
}
11491146

11501147
if (display == null)

0 commit comments

Comments
 (0)