decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

entity names are only unique by type

Browse source
This commit is contained in:
j 2015-02-06 12:42:19 +05:30
commit d492619be6
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pandora/annotation/views.py
View file

@ -168,7 +168,7 @@ def addAnnotation(request, data):
if layer['canAddAnnotations'].get(request.user.get_profile().get_level()):
if layer['type'] == 'entity':
try:
value = Entity.get_by_name(data['value']).get_id()
value = Entity.get_by_name(data['value'], layer['entity']).get_id()
except Entity.DoesNotExist:
response = json_response({})
response['status']['text'] = 'unkown entity'
@ -281,7 +281,7 @@ def editAnnotation(request, data):
if key in data:
if key == 'value' and layer['type'] == 'entity':
try:
value = Entity.get_by_name(data['value']).get_id()
value = Entity.get_by_name(data['value'], layer['entity']).get_id()
except Entity.DoesNotExist:
response['data'] = a.json()
response['data']['editable'] = True