Merge branch 'master' of github.com:aesthaddicts/OpenData

This commit is contained in:
Arne Schlüter 2015-02-08 15:49:05 +01:00
commit 29e4d599c1
2 changed files with 10 additions and 5 deletions

View file

@ -41,7 +41,7 @@ def articles():
"date": article[1],
"place": article[2],
"description": article[3],
"categories": [article[4]],
"categories": [article[4]] if article[4] else [],
"lat": locations[article_id][0],
"lng": locations[article_id][1],
"place": locations[article_id][2]

View file

@ -8,11 +8,16 @@ export default {
*/
byCategories: function (data, categories) {
return data.filter(function (incident) {
if(incident.categories.length > 0) {
for (var i = 0, l = incident.categories.length; i < l; i++)
if (categories.indexOf(incident.categories[i]) !== -1)
return true
} else {
if(categories.indexOf("uncategorized") !== -1)
return true
else
return false
}
});
},