fix: Check both Person and Email records in profile view (#4703)
This commit is contained in:
parent
eee6d0180c
commit
91170430ff
|
@ -104,6 +104,23 @@ class PersonTests(TestCase):
|
||||||
r = self.client.get(photo_url)
|
r = self.client.get(photo_url)
|
||||||
self.assertEqual(r.status_code, 200)
|
self.assertEqual(r.status_code, 200)
|
||||||
|
|
||||||
|
def test_person_profile_without_email(self):
|
||||||
|
person = PersonFactory(name="foobar@example.com")
|
||||||
|
# delete Email record
|
||||||
|
person.email().delete()
|
||||||
|
url = urlreverse("ietf.person.views.profile", kwargs={ "email_or_name": person.plain_name()})
|
||||||
|
r = self.client.get(url)
|
||||||
|
self.assertContains(r, person.name, status_code=200)
|
||||||
|
|
||||||
|
def test_person_profile_404(self):
|
||||||
|
urls = [
|
||||||
|
urlreverse("ietf.person.views.profile", kwargs={ "email_or_name": "nonexistent@example.com"}),
|
||||||
|
urlreverse("ietf.person.views.profile", kwargs={ "email_or_name": "Nonexistent Person"}),]
|
||||||
|
|
||||||
|
for url in urls:
|
||||||
|
r = self.client.get(url)
|
||||||
|
self.assertEqual(r.status_code, 404)
|
||||||
|
|
||||||
def test_person_photo(self):
|
def test_person_photo(self):
|
||||||
person = PersonFactory(with_bio=True)
|
person = PersonFactory(with_bio=True)
|
||||||
|
|
||||||
|
@ -403,8 +420,3 @@ class PersonUtilsTests(TestCase):
|
||||||
self.assertEqual(get_dots(ncmember),['nomcom'])
|
self.assertEqual(get_dots(ncmember),['nomcom'])
|
||||||
ncchair = RoleFactory(group__acronym='nomcom2020',group__type_id='nomcom',name_id='chair').person
|
ncchair = RoleFactory(group__acronym='nomcom2020',group__type_id='nomcom',name_id='chair').person
|
||||||
self.assertEqual(get_dots(ncchair),['nomcom'])
|
self.assertEqual(get_dots(ncchair),['nomcom'])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -68,11 +68,13 @@ def ajax_select2_search(request, model_name):
|
||||||
return HttpResponse(select2_id_name_json(objs), content_type='application/json')
|
return HttpResponse(select2_id_name_json(objs), content_type='application/json')
|
||||||
|
|
||||||
def profile(request, email_or_name):
|
def profile(request, email_or_name):
|
||||||
|
aliases = Alias.objects.filter(name=email_or_name)
|
||||||
|
persons = list(set([ a.person for a in aliases ]))
|
||||||
|
|
||||||
if '@' in email_or_name:
|
if '@' in email_or_name:
|
||||||
persons = [ get_object_or_404(Email, address=email_or_name).person, ]
|
emails = Email.objects.filter(address=email_or_name)
|
||||||
else:
|
persons += list(set([ e.person for e in emails ]))
|
||||||
aliases = Alias.objects.filter(name=email_or_name)
|
|
||||||
persons = list(set([ a.person for a in aliases ]))
|
|
||||||
persons = [ p for p in persons if p and p.id ]
|
persons = [ p for p in persons if p and p.id ]
|
||||||
if not persons:
|
if not persons:
|
||||||
raise Http404
|
raise Http404
|
||||||
|
|
Loading…
Reference in a new issue