Merge pull request #436 from karthikiyengar/master

#66, #30 - Support filterable property in columnMetadata
GriddleGriddle · Jul 3, 2016 · 34c4128 · 34c4128
2 parents f837c41 + d437232
commit 34c4128
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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;
               }
            }