diff --git a/smash/web/api_views/subject.py b/smash/web/api_views/subject.py index 6c9bdcbf30453e4c385bf59da815289ae78c0b08..2cf6c5ec449f24814e50260a1aba0feffd764ffb 100644 --- a/smash/web/api_views/subject.py +++ b/smash/web/api_views/subject.py @@ -356,7 +356,7 @@ def serialize_subject(study_subject): contact_attempts = ContactAttempt.objects.filter(subject=study_subject).order_by("-datetime_when") if len(contact_attempts) > 0: last_contact_attempt = contact_attempts[0] - last_contact_attempt_string = serialize_datetime(last_contact_attempt.datetime_when) + "<br/>" + str( + last_contact_attempt_string = serialize_datetime(last_contact_attempt.datetime_when) + "<br/>" + unicode( last_contact_attempt.worker) + "<br/> Success: " + bool_to_yes_no( last_contact_attempt.success) + "<br/>" + last_contact_attempt.comment diff --git a/smash/web/tests/api_views/test_subject.py b/smash/web/tests/api_views/test_subject.py index 4276b7346901ff26e972498352260bfb8d169f43..5e3de96ab491cfcb9b40efeb0e93b5678b3b9c30 100644 --- a/smash/web/tests/api_views/test_subject.py +++ b/smash/web/tests/api_views/test_subject.py @@ -104,6 +104,14 @@ class TestSubjectApi(LoggedInWithWorkerTestCase): response = self.client.get(reverse('web.api.subjects', kwargs={'type': SUBJECT_LIST_GENERIC})) self.assertEqual(response.status_code, 200) + def test_subjects_general_with_special_characters(self): + contact_attempt = create_contact_attempt(subject=self.study_subject) + contact_attempt.worker.first_name = "Ã special character" + contact_attempt.worker.save() + response = self.client.get(reverse('web.api.subjects', kwargs={'type': SUBJECT_LIST_GENERIC})) + self.assertEqual(response.status_code, 200) + logger.debug(response.content) + def test_subjects_voucher_almost_expired(self): response = self.client.get(reverse('web.api.subjects', kwargs={'type': SUBJECT_LIST_VOUCHER_EXPIRY})) self.assertEqual(response.status_code, 200)