External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-21 19:07:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix a 500 error when posting empty json to the config endpoint, this

Browse Source 
code was just wrong
This commit is contained in:
Matthew Jones
2015-01-26 10:12:26 -05:00
parent 8da5ba60f3
commit 9447c092ac
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/api/views.py
View File

@@ -207,15 +207,15 @@ class ApiV1ConfigView(APIView):
def post(self, request): def post(self, request):
if not request.user.is_superuser: if not request.user.is_superuser:
return Response(None, status=status.HTTP_404_NOT_FOUND) return Response(None, status=status.HTTP_404_NOT_FOUND)
if "eula_accepted" not in request.DATA:
return Response({"error": "Missing 'eula_accepted' property"}, status=status.HTTP_400_BAD_REQUEST)
if not request.DATA["eula_accepted"]:
return Response({"error": "'eula_accepted' must be True"}, status=status.HTTP_400_BAD_REQUEST)
request.DATA.pop("eula_accepted")
try: try:
data_actual = json.dumps(request.DATA) data_actual = json.dumps(request.DATA)
except Exception, e: except Exception, e:
return Response({"error": "Invalid JSON"}, status=status.HTTP_400_BAD_REQUEST) return Response({"error": "Invalid JSON"}, status=status.HTTP_400_BAD_REQUEST)
if "eula_accepted" not in data_actual:
return Response({"error": "Missing 'eula_accepted' property"}, status=status.HTTP_400_BAD_REQUEST)
if not data_actual["eula_accepted"]:
return Response({"error": "'eula_accepted' must be True"}, status=status.HTTP_400_BAD_REQUEST)
data_actual.pop("eula_accepted")
license_reader = TaskSerializer() license_reader = TaskSerializer()
try: try:
license_data = license_reader.from_string(data_actual) license_data = license_reader.from_string(data_actual)