Changeset 16279

Timestamp:

12 Oct 2020, 09:54:11 (4 years ago)

Author:

Henrik Bettermann

Message:

Do it right.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py

@@ -203 +203 @@
         try:
             for item in mapping:
-                setattr(student, item[1], getattr(self, item[0], None))
+                if item[0] == 'email':
+                    setattr(student, item[1], str(getattr(self, item[0], None)))
+                else:
+                    setattr(student, item[1], getattr(self, item[0], None))
         except RequiredMissing, err:
             site['students']._curr_stud_id -= 1
             return False, 'RequiredMissing: %s' % err
         except WrongType, err:
-            if item[0] == 'email':
-                setattr(student, item[1], str(getattr(self, item[0], None)))
-            else:
-                return False, 'WrongType: %s' % err
+            site['students']._curr_stud_id -= 1
+            return False, 'WrongType: %s' % err
         except:
             site['students']._curr_stud_id -= 1