diff --git a/seminar/migrations/0051_resitel_to_osoba.py b/seminar/migrations/0051_resitel_to_osoba.py index 17237bd0..04220896 100644 --- a/seminar/migrations/0051_resitel_to_osoba.py +++ b/seminar/migrations/0051_resitel_to_osoba.py @@ -28,26 +28,23 @@ def resitel_to_osoba(apps,schema_editor): if u.first_name: if not o.jmeno: o.jmeno = u.first_name - u.first_name = 'Použij osobu!' + u.first_name += ' (Uživatel!)' elif o.jmeno == u.first_name: - u.first_name = 'Použij osobu!' + u.first_name += ' (Uživatel!)' else: raise ValueError('jmeno a first_name rozdílné: "{}" vs. "{}"'.format(o.jmeno, u.first_name)) if u.last_name: if not o.prijmeni: o.prijmeni = u.last_name - u.last_name = 'Použij osobu!' + u.last_name += ' (Uživatel!)' elif o.prijmeni == u.last_name: - u.last_name = 'Použij osobu!' + u.last_name += ' (Uživatel!)' else: raise ValueError('prijmeni a last_name rozdílné: "{}" vs. "{}"'.format(o.prijmeni, u.last_name)) if u.email: if not o.email: o.email = u.email - u.email = 'Použij osobu!' - elif o.email == u.email: - u.email = 'Použij osobu!' - else: + elif o.email != u.email: raise ValueError('o.email a u.email rozdílné: "{}" vs. "{}"'.format(o.email, u.email)) u.save() diff --git a/seminar/migrations/0052_user_to_organizator.py b/seminar/migrations/0052_user_to_organizator.py index 47d151ae..fec3c2af 100644 --- a/seminar/migrations/0052_user_to_organizator.py +++ b/seminar/migrations/0052_user_to_organizator.py @@ -53,9 +53,8 @@ def spoj_k_organizatorum_osoby(apps, scema_editor): osoba.jmeno = user.first_name osoba.prijmeni = user.last_name osoba.email = user.email - user.jmeno = "Použij osobu!" - user.prijmeni = "Použij osobu!" - user.email = "Použij osobu!" + user.jmeno += " (Uživatel!)" + user.prijmeni += " (Uživatel!)" user.save() except EndException: pass