diff --git a/scripts/griddle.jsx b/scripts/griddle.jsx index 13d8225d..2e08279d 100755 --- a/scripts/griddle.jsx +++ b/scripts/griddle.jsx @@ -146,11 +146,13 @@ var Griddle = React.createClass({ uniqueIdentifier: React.PropTypes.string }, defaultFilter: function(results, filter) { + var that = this; return _filter(results, function(item) { var arr = deep.keys(item); for(var i = 0; i < arr.length; i++){ - if ((deep.getAt(item, arr[i]) || "").toString().toLowerCase().indexOf(filter.toLowerCase()) >= 0){ + var isFilterable = that.columnSettings.getMetadataColumnProperty(arr[i], "filterable", true); + if (isFilterable && (deep.getAt(item, arr[i]) || "").toString().toLowerCase().indexOf(filter.toLowerCase()) >= 0){ return true; } }