Merge pull request #1117 from getredash/feature/params_ui

Fix #1052: filter not working for date/time values
getredash · Jun 14, 2016 · 4fabaae · 4fabaae
2 parents df637e3 + a7af596
commit 4fabaae
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/rd_ui/app/scripts/services/resources.js b/rd_ui/app/scripts/services/resources.js
@@ -174,9 +174,14 @@
               };
 
               return (memo && _.some(filter.current, function(v) {
-                // We compare with either the value or the String representation of the value,
-                // because Select2 casts true/false to "true"/"false".
-                return v == row[filter.name] || String(row[filter.name]) == v
+                var value = row[filter.name];
+                if (moment.isMoment(value)) {
+                  return value.isSame(v);
+                } else {
+                  // We compare with either the value or the String representation of the value,
+                  // because Select2 casts true/false to "true"/"false".
+                  return (v == value || String(value) == v);
+                }
               }));
             }, true);
           });