Piotr Gawron
--- a/smash/web/models/mail_template.py

+ 3

− 3
+++ b/smash/web/models/mail_template.py

+ 3

− 3
 @@ -338,13 +338,13 @@ class MailTemplate(models.Model):
                "##S_ADDRESS##": study_subject.subject.address,
                "##S_CITY##": study_subject.subject.city,
                "##S_COUNTRY##": str(study_subject.subject.country),
-                "##S_DIAGNOSIS_YEAR##": study_subject.get_custom_field_value('Year of diagnosis'),
+                "##S_DIAGNOSIS_YEAR##": str(study_subject.get_custom_field_value('Year of diagnosis')),
                "##S_DATE_ADDED##": date_to_str(study_subject.date_added, DATE_FORMAT_SHORT),
                "##S_DATE_BORN##": date_born,
-                "##S_DIAGNOSIS##": study_subject.get_custom_field_value('Diagnosis'),
+                "##S_DIAGNOSIS##": str(study_subject.get_custom_field_value('Diagnosis')),
                "##S_EMAIL##": str(study_subject.subject.email),
                "##S_SEX##": study_subject.subject.get_sex_display(),
-                "##S_MPOWER_ID##": study_subject.get_custom_field_value('MPower ID'),
+                "##S_MPOWER_ID##": str(study_subject.get_custom_field_value('MPower ID')),
                "##S_ND_NUMBER##": study_subject.nd_number,
                "##S_PHONE_NUMBER##": str(study_subject.subject.phone_number),
                "##S_PHONE_NUMBER_2##": str(study_subject.subject.phone_number_2),