From 8425e72101b0210313cbf7fe6a03ed34efca67da Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Mon, 30 Nov 2015 10:01:33 +0800
Subject: [PATCH] fix filter bug

---
 app/assets/javascripts/src/Metamaps.js.erb | 48 +++++++++++++---------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/app/assets/javascripts/src/Metamaps.js.erb b/app/assets/javascripts/src/Metamaps.js.erb
index d15172c9..33cb15ef 100644
--- a/app/assets/javascripts/src/Metamaps.js.erb
+++ b/app/assets/javascripts/src/Metamaps.js.erb
@@ -3300,26 +3300,34 @@ Metamaps.Filter = {
         // the first option enables us to accept
         // ['Topics', 'Synapses'] as 'collection'
         if (typeof collection === "object") {
-            Metamaps[collection[0]].each(function(model) {
-                var prop = model.get(propertyToCheck) ? model.get(propertyToCheck).toString() : false;
-                if (prop && newList.indexOf(prop) === -1) {
-                    newList.push(prop);
-                }
-            });
-            Metamaps[collection[1]].each(function(model) {
-                var prop = model.get(propertyToCheck) ? model.get(propertyToCheck).toString() : false;
-                if (prop && newList.indexOf(prop) === -1) {
-                    newList.push(prop);
-                }
-            });
-        }
-        else if (typeof collection === "string") {
-            Metamaps[collection].each(function(model) {
-                var prop = model.get(propertyToCheck) ? model.get(propertyToCheck).toString() : false;
-                if (prop && newList.indexOf(prop) === -1) {
-                    newList.push(prop);
-                }
-            });
+          Metamaps[collection[0]].each(function(model) {
+            var prop = model.get(propertyToCheck);
+            if (prop !== null) {
+              prop = prop.toString();
+              if (newList.indexOf(prop) === -1) {
+                newList.push(prop);
+              }
+            }
+          });
+          Metamaps[collection[1]].each(function(model) {
+            var prop = model.get(propertyToCheck);
+            if (prop !== null) {
+              prop = prop.toString();
+              if (newList.indexOf(prop) === -1) {
+                newList.push(prop);
+              }
+            }
+          });
+        } else if (typeof collection === "string") {
+          Metamaps[collection].each(function(model) {
+            var prop = model.get(propertyToCheck);
+            if (prop !== null) {
+              prop = prop.toString();
+              if (newList.indexOf(prop) === -1) {
+                newList.push(prop);
+              }
+            }
+          });
         }
         
         removed = _.difference(self.filters[filtersToUse], newList);