2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fix error 500 in positioning api

Browse source
This commit is contained in:
Laura Klünder 2019-12-28 17:47:20 +01:00
parent c4cd843a38
commit 9b7092d057
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/c3nav/routing/api.py
View file

@ -105,8 +105,15 @@ class RoutingViewSet(ViewSet):
@action(detail=False, methods=('POST', )) @action(detail=False, methods=('POST', ))
def locate(self, request, *args, **kwargs): def locate(self, request, *args, **kwargs):
if isinstance(request.data, list):
stations_data = request.data
data = {}
else:
data = request.data
stations_data = data['stations']
try: try:
location = Locator.load().locate(request.data, permissions=AccessPermission.get_for_request(request)) location = Locator.load().locate(stations_data, permissions=AccessPermission.get_for_request(request))
if location is not None: if location is not None:
increment_cache_key('apistats__locate__%s' % location.pk) increment_cache_key('apistats__locate__%s' % location.pk)
except ValidationError: except ValidationError:
@ -114,8 +121,8 @@ class RoutingViewSet(ViewSet):
'errors': (_('Invalid scan data.'),), 'errors': (_('Invalid scan data.'),),
}, status=400) }, status=400)
if 'set_position' in request.data: if 'set_position' in data:
set_position = request.data['set_position'] set_position = data['set_position']
if not set_position.startswith('p:'): if not set_position.startswith('p:'):
return Response({ return Response({
'errors': (_('Invalid set_location.'),), 'errors': (_('Invalid set_location.'),),
@ -128,12 +135,12 @@ class RoutingViewSet(ViewSet):
'errors': (_('Invalid set_location.'),), 'errors': (_('Invalid set_location.'),),
}, status=400) }, status=400)
data = { form_data = {
**request.data, **data,
'coordinates_id': None if location is None else location.pk, 'coordinates_id': None if location is None else location.pk,
} }
form = PositionAPIUpdateForm(instance=position, data=data, request=request) form = PositionAPIUpdateForm(instance=position, data=form_data, request=request)
if not form.is_valid(): if not form.is_valid():
return Response({ return Response({