From 93de3f9a732c7b52a9b54ad2ef2dd0babdbaa26c Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 27 Jan 2015 16:14:15 -0500 Subject: [PATCH] Fix up an issue posting eula with the license to the config endpoint --- awx/api/views.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index feb9184678..056079690d 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -207,15 +207,16 @@ class ApiV1ConfigView(APIView): def post(self, request): if not request.user.is_superuser: return Response(None, status=status.HTTP_404_NOT_FOUND) + print request.DATA + 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: data_actual = json.dumps(request.DATA) except Exception, e: 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() try: license_data = license_reader.from_string(data_actual)