Merge remote-tracking branch 'origin/release_3.1.2' into devel

This commit is contained in:
Ryan Petrello
2017-03-10 10:57:03 -05:00
100 changed files with 576 additions and 341 deletions

View File

@@ -3,6 +3,7 @@
# Python
import re
import json
# Django
from django.core.exceptions import FieldError, ValidationError
@@ -296,7 +297,7 @@ class FieldLookupBackend(BaseFilterBackend):
except (FieldError, FieldDoesNotExist, ValueError, TypeError) as e:
raise ParseError(e.args[0])
except ValidationError as e:
raise ParseError(e.messages)
raise ParseError(json.dumps(e.messages, ensure_ascii=False))
class OrderByBackend(BaseFilterBackend):

View File

@@ -3503,6 +3503,7 @@ class BaseJobEventsList(SubListAPIView):
parent_model = None # Subclasses must define this attribute.
relationship = 'job_events'
view_name = _('Job Events List')
search_fields = ('stdout',)
def finalize_response(self, request, response, *args, **kwargs):
response['X-UI-Max-Events'] = settings.RECOMMENDED_MAX_EVENTS_DISPLAY_HEADER