From 7bd647c0d60814e6280df63c9fb3d7abbf3589ef Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 13 Feb 2015 13:04:42 +0000 Subject: [PATCH] Don't create empty Alias records. Fixes issue #1603. - Legacy-Id: 9086 --- ietf/person/models.py | 2 +- ietf/secr/rolodex/views.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ietf/person/models.py b/ietf/person/models.py index 5342c04a8..aea77a9b9 100644 --- a/ietf/person/models.py +++ b/ietf/person/models.py @@ -92,7 +92,7 @@ class Person(PersonInfo): )) send_mail_preformatted(None, msg) self.alias_set.get_or_create(name=self.name) - if self.name != self.ascii: + if self.ascii and 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. diff --git a/ietf/secr/rolodex/views.py b/ietf/secr/rolodex/views.py index 930ed6fd3..82849e3ee 100644 --- a/ietf/secr/rolodex/views.py +++ b/ietf/secr/rolodex/views.py @@ -173,7 +173,9 @@ def edit(request, id): for field in ('name','ascii','ascii_short'): if field in person_form.changed_data: person.alias_set.filter(name=getattr(person,field)).delete() - Alias.objects.get_or_create(person=person,name=person_form.cleaned_data[field]) + alias = person_form.cleaned_data[field] + if alias: + Alias.objects.get_or_create(person=person,name=alias) person_form.save() email_formset.save()