Merge pull request #353 from EverythingMe/bug/dashboard_auto_refresh

Fix: nulls converted to strings in UI
getredash · Jan 19, 2015 · fd37188 · fd37188
2 parents 9a3b25e + 758e27c
commit fd37188
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/rd_ui/app/scripts/services/resources.js b/rd_ui/app/scripts/services/resources.js
@@ -22,7 +22,7 @@
             } else if (_.isString(v) && v.match(/^\d{4}-\d{2}-\d{2}/)) {
               row[k] = moment(v);
               columnTypes[k] = 'date';
-            } else if (typeof(v) == 'object') {
+            } else if (typeof(v) == 'object' && v !== null) {
               row[k] = JSON.stringify(v);
             }
           }, this);