From 900b732478983cbb5814010ced1d29bed4ea97a6 Mon Sep 17 00:00:00 2001 From: Alfredos-Panagiotis Damkalis Date: Mon, 30 Sep 2019 18:54:45 +0300 Subject: [PATCH] Fix assignment of variable in scheduling_stations view Signed-off-by: Alfredos-Panagiotis Damkalis --- network/base/views.py | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/network/base/views.py b/network/base/views.py index 20cd195..419d534 100644 --- a/network/base/views.py +++ b/network/base/views.py @@ -647,34 +647,28 @@ def scheduling_stations(request): uuid = request.POST.get('transmitter', None) if uuid is None: data = [{'error': 'You should select a Transmitter.'}] - json_response = JsonResponse(data, safe=False) + return JsonResponse(data, safe=False) else: try: transmitter = get_transmitter_by_uuid(uuid) if not transmitter: - data = [{'error': 'You should select a Transmitter.'}] - json_response = JsonResponse(data, safe=False) + data = [{'error': 'You should select a valid Transmitter.'}] + return JsonResponse(data, safe=False) else: downlink = transmitter[0]['downlink_low'] if downlink is None: data = [{'error': 'You should select a valid Transmitter.'}] - json_response = JsonResponse(data, safe=False) + return JsonResponse(data, safe=False) except DBConnectionError as e: data = [{'error': e.message}] - json_response = JsonResponse(data, safe=False) + return JsonResponse(data, safe=False) - if not json_response: - stations = Station.objects.filter(status__gt=0) - available_stations = get_available_stations(stations, downlink, request.user) - import sys - sys.stdout.flush() - data = { - 'stations': StationSerializer(available_stations, many=True).data, - } - - json_response = JsonResponse(data, safe=False) - - return json_response + stations = Station.objects.filter(status__gt=0) + available_stations = get_available_stations(stations, downlink, request.user) + data = { + 'stations': StationSerializer(available_stations, many=True).data, + } + return JsonResponse(data, safe=False) @ajax_required