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

aliases

Browse source
This commit is contained in:
j 2011-03-05 15:31:56 +01:00
commit 45896cdd2a
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pandora/place/views.py
View file

@ -20,6 +20,7 @@ def addPlace(request):
'''
param data {
name: "",
aliases: [],
geoname: "",
countryCode: '',
south: float,
@ -34,17 +35,19 @@ def addPlace(request):
data = json.loads(request.POST['data'])
exists = False
names = data.pop('name')
if isinstance(names, basestring):
names = [names]
for name in names:
for name in [names] + data.get('aliases', []):
if models.Place.objects.filter(name_find__icontains=u'|%s|'%name).count() != 0:
exists = True
if not exists:
place = models.Place()
place.user = request.user
place.name = tuple(names)
place.name = names
place.aliases = tuple(data.pop('aliases', []))
for key in data:
setattr(place, key, data[key])
value = data[key]
if isinstance(value, list):
value = tuple(value)
setattr(place, key, value)
place.save()
response = json_response(place.json())
else:
@ -70,7 +73,7 @@ def editPlace(request):
names = [names]
if place.editable(request.user):
conflict = False
for name in names:
for name in names + data.get('aliases', []):
if models.Place.objects.filter(name_find__icontains=u'|%s|'%name).exclude(id=place.id).count() != 0:
conflict = True
if 'geoname' in data:
@ -79,7 +82,10 @@ def editPlace(request):
if not conflict:
for key in data:
if key != 'id':
setattr(place, key, data[key])
value = data[key]
if isinstance(value, list):
value = tuple(value)
setattr(place, key, value)
place.save()
response = json_response(place.json())
else: