diff --git a/lms/djangoapps/support/static/support/jsx/logged_in_user.jsx b/lms/djangoapps/support/static/support/jsx/logged_in_user.jsx index f71f0019bc..28a2f8d85f 100644 --- a/lms/djangoapps/support/static/support/jsx/logged_in_user.jsx +++ b/lms/djangoapps/support/static/support/jsx/logged_in_user.jsx @@ -34,10 +34,10 @@ function LoggedInUser({ userInformation, setErrorState, zendeskApiHost, submitFo ); } - let subjectElement; - subjectElement = (
- - @@ -86,7 +86,7 @@ function LoggedInUser({ userInformation, setErrorState, zendeskApiHost, submitFo
- {subjectElement} + {topicElement}
diff --git a/lms/djangoapps/support/static/support/jsx/single_support_form.jsx b/lms/djangoapps/support/static/support/jsx/single_support_form.jsx index 164ca65973..61e1aa05d9 100644 --- a/lms/djangoapps/support/static/support/jsx/single_support_form.jsx +++ b/lms/djangoapps/support/static/support/jsx/single_support_form.jsx @@ -37,7 +37,7 @@ class RenderForm extends React.Component { $userInfo = $('.user-info'), request = new XMLHttpRequest(), $course = $('#course'), - $subject = $('#subject'), + $topic = $('#topic'), data = { comment: { body: $('#message').val(), @@ -67,16 +67,16 @@ class RenderForm extends React.Component { value: course, }]; - let subject; - subject = $subject.find(':selected').val(); - if (!subject) { - subject = $subject.val(); + let topic; + topic = $topic.find(':selected').val(); + if (!topic) { + topic = $topic.val(); } - if (!subject) { - $('#subject').closest('.form-group').addClass('has-error'); - errors.push(gettext('Select a subject for your support request.')); + if (!topic) { + $('#topic').closest('.form-group').addClass('has-error'); + errors.push(gettext('Select a topic for your support request.')); } - data.subject = subject; + data.subject = topic; // Zendesk API requires 'subject' if (this.validateData(data, errors)) { request.open('POST', url, true); diff --git a/lms/djangoapps/support/static/support/jsx/success.jsx b/lms/djangoapps/support/static/support/jsx/success.jsx index 1b594c9759..92eb4ac859 100644 --- a/lms/djangoapps/support/static/support/jsx/success.jsx +++ b/lms/djangoapps/support/static/support/jsx/success.jsx @@ -28,7 +28,7 @@ function Success({ platformName, homepageUrl, dashboardUrl, isLoggedIn }) {
-

{gettext('Thank you for submitting a request!')}

+

{gettext('Thank you for submitting a request! We appreciate your patience while we work to review your request.')}

diff --git a/openedx/core/djangoapps/zendesk_proxy/v1/views.py b/openedx/core/djangoapps/zendesk_proxy/v1/views.py index 0899a3a797..25f5640e27 100644 --- a/openedx/core/djangoapps/zendesk_proxy/v1/views.py +++ b/openedx/core/djangoapps/zendesk_proxy/v1/views.py @@ -1,6 +1,7 @@ """ Define request handlers used by the zendesk_proxy djangoapp """ +import logging from rest_framework import status from rest_framework.parsers import JSONParser @@ -10,6 +11,7 @@ from rest_framework.views import APIView from openedx.core.djangoapps.zendesk_proxy.utils import create_zendesk_ticket +logger = logging.getLogger(__name__) REQUESTS_PER_HOUR = 50 @@ -62,7 +64,8 @@ class ZendeskPassthroughView(APIView): custom_fields=request.data['custom_fields'], tags=request.data['tags'] ) - except KeyError: + except KeyError as key: + logger.error('Zendesk Proxy Bad Request KeyError: %s', key) return Response(status=status.HTTP_400_BAD_REQUEST) return Response(