diff --git a/app.js b/app.js index 5a72dca..88614cd 100644 --- a/app.js +++ b/app.js @@ -4,7 +4,6 @@ var favicon = require('serve-favicon'); var logger = require('morgan'); var bodyParser = require('body-parser'); var fs = require('fs'); - var config; if(fs.existsSync('./config/nodes.js')){ @@ -12,8 +11,7 @@ if(fs.existsSync('./config/nodes.js')){ } else { config = require('./config/nodes.default'); } -console.log(config); -// var config = require('./config/nodes'); + var Node = require('./models/node'); var app = express(); diff --git a/public/js/filters.js b/public/js/filters.js index 189581b..e5c062c 100644 --- a/public/js/filters.js +++ b/public/js/filters.js @@ -73,7 +73,10 @@ angular.module('netStatsApp.filters', []) }) .filter('geoTooltip', function() { return function(geo) { - return geo.city + ", " + geo.country; + if(geo !== null) + return geo.city + ", " + geo.country; + + return ''; }; });