External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 00:08:44 -03:30
Code Issues Packages Projects Releases Wiki Activity

API fixes for 500 errors.

Browse Source
This commit is contained in:
Chris Church
2016-02-24 18:38:04 -05:00
parent 5b89c5e126
commit a2595dcf12
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@@ -478,6 +478,10 @@ class BaseSerializer(serializers.ModelSerializer):
return attrs return attrs
class EmptySerializer(serializers.Serializer):
pass
class BaseFactSerializer(DocumentSerializer): class BaseFactSerializer(DocumentSerializer):
__metaclass__ = BaseSerializerMetaclass __metaclass__ = BaseSerializerMetaclass

8
awx/api/views.py
View File

@@ -1940,7 +1940,7 @@ class JobTemplateSurveySpec(GenericAPIView):
model = JobTemplate model = JobTemplate
parent_model = JobTemplate parent_model = JobTemplate
# FIXME: Add serializer class to define fields in OPTIONS request! serializer_class = EmptySerializer
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
obj = self.get_object() obj = self.get_object()
@@ -2019,8 +2019,8 @@ class JobTemplateActivityStreamList(SubListAPIView):
class JobTemplateCallback(GenericAPIView): class JobTemplateCallback(GenericAPIView):
model = JobTemplate model = JobTemplate
# FIXME: Add serializer class to define fields in OPTIONS request!
permission_classes = (JobTemplateCallbackPermission,) permission_classes = (JobTemplateCallbackPermission,)
serializer_class = EmptySerializer
@csrf_exempt @csrf_exempt
@transaction.non_atomic_requests @transaction.non_atomic_requests
@@ -2202,7 +2202,7 @@ class SystemJobTemplateDetail(RetrieveAPIView):
class SystemJobTemplateLaunch(GenericAPIView): class SystemJobTemplateLaunch(GenericAPIView):
model = SystemJobTemplate model = SystemJobTemplate
# FIXME: Add serializer class to define fields in OPTIONS request! serializer_class = EmptySerializer
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
return Response({}) return Response({})
@@ -2273,7 +2273,7 @@ class JobActivityStreamList(SubListAPIView):
class JobStart(GenericAPIView): class JobStart(GenericAPIView):
model = Job model = Job
# FIXME: Add serializer class to define fields in OPTIONS request! serializer_class = EmptySerializer
is_job_start = True is_job_start = True
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):

5
awx/main/views.py
View File

@@ -34,7 +34,10 @@ def handle_error(request, status=404, **kwargs):
status_code = status status_code = status
default_detail = kwargs['content'] default_detail = kwargs['content']
api_error_view = ApiErrorView.as_view(view_name=kwargs['name'], exception_class=APIException) api_error_view = ApiErrorView.as_view(view_name=kwargs['name'], exception_class=APIException)
return api_error_view(request) response = api_error_view(request)
if hasattr(response, 'render'):
response.render()
return response
else: else:
kwargs['content'] = format_html('<span class="nocode">{}</span>', kwargs.get('content', '')) kwargs['content'] = format_html('<span class="nocode">{}</span>', kwargs.get('content', ''))
return render(request, 'error.html', kwargs, status=status) return render(request, 'error.html', kwargs, status=status)