0x2620/cablegates
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

funky annotation ids

Browse source
This commit is contained in:
j 2011-08-18 13:53:38 +02:00
parent a28dce4f65
commit d1d03e02e4
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/annotation/managers.py
View file

@ -40,7 +40,9 @@ def parseCondition(condition, user):
return ~q return ~q
else: else:
return q return q
if k in ('id', 'places__id'): if k == 'id':
v = ox.from32(v.split('/')[-1])
elif k in ('places__id', ):
v = ox.from32(v) v = ox.from32(v)
if isinstance(v, bool): #featured and public flag if isinstance(v, bool): #featured and public flag
key = k key = k

2
pandora/annotation/models.py
View file

@ -101,7 +101,7 @@ class Annotation(models.Model):
return self.value return self.value
def get_id(self): def get_id(self):
return ox.to32(self.id) return '%s/%s' % (self.item.itemId, ox.to32(self.id))
def json(self, layer=False, keys=None): def json(self, layer=False, keys=None):
j = { j = {

3
pandora/annotation/views.py
View file

@ -166,7 +166,8 @@ def editAnnotation(request):
''' '''
response = json_response({}) response = json_response({})
data = json.loads(request.POST['data']) data = json.loads(request.POST['data'])
a = get_object_or_404_json(models.Annotation, pk=ox.from32(data['id'])) itemId, annotationId = data['id'].split('/')
a = get_object_or_404_json(models.Annotation, pk=ox.from32(annotationId))
if a.editable(request.user): if a.editable(request.user):
a.value = data['value'] a.value = data['value']
a.start = data['in'] a.start = data['in']