Merge branch 'master' into feature/abarrett/lms-notes-app

This commit is contained in:
Arthur Barrett
2013-05-14 13:45:17 -04:00

View File

@@ -161,7 +161,7 @@ def submit_feedback_via_zendesk(request):
try:
ticket_id = zendesk_api.create_ticket(new_ticket)
except zendesk.ZendeskError as err:
log.error("%s", str(err))
log.error("Error creating Zendesk ticket: %s", str(err))
return HttpResponse(status=500)
# Additional information is provided as a private update so the information
@@ -170,7 +170,7 @@ def submit_feedback_via_zendesk(request):
try:
zendesk_api.update_ticket(ticket_id, ticket_update)
except zendesk.ZendeskError as err:
log.error("%s", str(err))
log.error("Error updating Zendesk ticket: %s", str(err))
# The update is not strictly necessary, so do not indicate failure to the user
pass