diff --git a/pandora/annotation/managers.py b/pandora/annotation/managers.py index b0447a67..c0377c0c 100644 --- a/pandora/annotation/managers.py +++ b/pandora/annotation/managers.py @@ -20,7 +20,7 @@ def parseCondition(condition, user): k = condition.get('key', 'name') k = { 'user': 'user__username', - 'place': 'places__id', + 'place': 'places__name', }.get(k, k) if not k: k = 'name' diff --git a/static/js/pandora/ui/list.js b/static/js/pandora/ui/list.js index d5639977..c5366b49 100644 --- a/static/js/pandora/ui/list.js +++ b/static/js/pandora/ui/list.js @@ -155,7 +155,7 @@ pandora.ui.list = function(view) { // fixme: remove view argument items: function(data, callback) { return pandora.api.findAnnotations($.extend(data, { query: { - conditions:[{key: 'place', value: place.id, operator:'='}] + conditions:[{key: 'place', value: place.name, operator:'='}] }, itemQuery: pandora.Query.toObject() }), callback);