diff --git a/ietf/nomcom/utils.py b/ietf/nomcom/utils.py index 5b1cf4731..3b6edc32f 100644 --- a/ietf/nomcom/utils.py +++ b/ietf/nomcom/utils.py @@ -17,7 +17,7 @@ from django.shortcuts import get_object_or_404 from django.utils.encoding import smart_str from ietf.dbtemplate.models import DBTemplate -from ietf.person.models import Email, Person, Alias +from ietf.person.models import Email, Person from ietf.utils.pipe import pipe from ietf.utils import unaccent from ietf.utils.mail import send_mail_text, send_mail @@ -285,9 +285,6 @@ def get_or_create_nominee(nomcom, candidate_name, candidate_email, position, aut address=candidate_email) email.person = person email.save() - Alias.objects.create(name=person.name, person=person) - if person.name != person.ascii: - Alias.objects.create(name=person.ascii, person=person) # Add the nomination for a particular position nominee, created = Nominee.objects.get_or_create(email=email, nomcom=nomcom) diff --git a/ietf/person/models.py b/ietf/person/models.py index 3db715d73..248c0ebad 100644 --- a/ietf/person/models.py +++ b/ietf/person/models.py @@ -91,6 +91,9 @@ class Person(PersonInfo): settings=settings )) send_mail_preformatted(None, msg) + self.alias_set.get_or_create(name=self.name) + if self.name != self.ascii: + self.alias_set.get_or_create(name=self.ascii) #this variable, if not None, may be used by url() to keep the sitefqdn. default_hostscheme = None diff --git a/ietf/secr/rolodex/views.py b/ietf/secr/rolodex/views.py index 9082752fc..930ed6fd3 100644 --- a/ietf/secr/rolodex/views.py +++ b/ietf/secr/rolodex/views.py @@ -98,11 +98,6 @@ def add_proceed(request): person.user = user person.save() - # create the Alias - Alias.objects.create(person=person,name=name) - if person.ascii != person.name: - Alias.objects.create(person=person,name=person.ascii) - messages.success(request, 'The Rolodex entry was added successfully') return redirect('rolodex_view', id=person.id) else: diff --git a/ietf/submit/utils.py b/ietf/submit/utils.py index 79020b7f8..88f744ce5 100644 --- a/ietf/submit/utils.py +++ b/ietf/submit/utils.py @@ -9,7 +9,7 @@ from ietf.doc.utils import add_state_change_event, rebuild_reference_relations from ietf.group.models import Group from ietf.ietfauth.utils import has_role from ietf.name.models import StreamName -from ietf.person.models import Person, Alias, Email +from ietf.person.models import Person, Email from ietf.submit.mail import announce_to_lists, announce_new_version, announce_to_authors from ietf.submit.models import Submission, SubmissionEvent, Preapproval, DraftSubmissionStateName from ietf.utils import unaccent @@ -238,10 +238,6 @@ def ensure_person_email_info_exists(name, email): person.ascii = unaccent.asciify(person.name) person.save() - Alias.objects.create(name=person.name, person=person) - if person.name != person.ascii: - Alias.objects.create(name=person.ascii, person=person) - # make sure we have an email address if email: addr = email.lower() diff --git a/ietf/utils/test_data.py b/ietf/utils/test_data.py index ea887c7aa..262a4d0c9 100644 --- a/ietf/utils/test_data.py +++ b/ietf/utils/test_data.py @@ -11,7 +11,7 @@ from ietf.iesg.models import TelechatDate from ietf.ipr.models import HolderIprDisclosure, IprDocRel, IprDisclosureStateName, IprLicenseTypeName from ietf.meeting.models import Meeting from ietf.name.models import StreamName -from ietf.person.models import Person, Alias, Email +from ietf.person.models import Person, Email def create_person(group, role_name, name=None, username=None, email_address=None, password=None): """Add person/user/email and role.""" @@ -28,7 +28,6 @@ def create_person(group, role_name, name=None, username=None, email_address=None user.set_password(password) user.save() person = Person.objects.create(name=name, ascii=name, user=user) - Alias.objects.create(name=name, person=person) email = Email.objects.create(address=email_address, person=person) Role.objects.create(group=group, name_id=role_name, person=person, email=email) @@ -50,7 +49,6 @@ def make_immutable_base_data(): # system system_person = Person.objects.create(name="(System)", ascii="(System)", address="") - Alias.objects.create(person=system_person, name=system_person.name) Email.objects.create(address="", person=system_person) # high-level groups @@ -94,7 +92,6 @@ def make_immutable_base_data(): for i in range(1, 10): u = User.objects.create(username="ad%s" % i) p = Person.objects.create(name="Ad No%s" % i, ascii="Ad No%s" % i, user=u) - Alias.objects.create(name=p.name, person=p) email = Email.objects.create(address="ad%s@ietf.org" % i, person=p) if i < 6: # active