Skip to content

Commit 53c4ac3

Browse files
committed
Removed the Person.address field, which is not being used. This was a legacy from the 2001 perl-based datatracker tables. Fixes issue ietf-tools#2504.
- Legacy-Id: 15095
1 parent e177f45 commit 53c4ac3

9 files changed

Lines changed: 28 additions & 9 deletions

File tree

ietf/doc/tests_draft.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1435,7 +1435,7 @@ def setUp(self):
14351435
expires=datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
14361436
group=mars_wg,
14371437
)
1438-
p = Person.objects.create(address="basea_author")
1438+
p = Person.objects.create(name="basea_author")
14391439
e = Email.objects.create(address="basea_author@example.com", person=p)
14401440
self.basea.documentauthor_set.create(person=p, email=e, order=1)
14411441

ietf/ietfauth/tests.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ def test_profile(self):
207207
"name": u"Test Nãme",
208208
"ascii": u"Test Name",
209209
"ascii_short": u"T. Name",
210-
"address": "Test address",
211210
"affiliation": "Test Org",
212211
"active_emails": email_address,
213212
}

ietf/nomcom/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ def nominate_newperson_view(self, *args, **kwargs):
694694

695695
# check objects
696696
email = Email.objects.get(address=candidate_email)
697-
Person.objects.get(name=candidate_name, address=candidate_email)
697+
Person.objects.get(name=candidate_name)
698698
nominee = Nominee.objects.get(email=email)
699699
NomineePosition.objects.get(position=position, nominee=nominee)
700700
feedback = Feedback.objects.filter(positions__in=[position],

ietf/nomcom/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ def make_nomineeposition_for_newperson(nomcom, candidate_name, candidate_email,
375375
email = Email.objects.create(address=candidate_email)
376376
person = Person.objects.create(name=candidate_name,
377377
ascii=unidecode_name(candidate_name),
378-
address=candidate_email)
378+
)
379379
email.person = person
380380
email.save()
381381

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.11.12 on 2018-04-26 05:17
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
dependencies = [
11+
('person', '0002_auto_20180330_0808'),
12+
]
13+
14+
operations = [
15+
migrations.RemoveField(
16+
model_name='person',
17+
name='address',
18+
),
19+
migrations.RemoveField(
20+
model_name='personhistory',
21+
name='address',
22+
),
23+
]

ietf/person/models.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class PersonInfo(models.Model):
3737
# The short ascii-form of the name. Also in alias table if non-null
3838
ascii_short = models.CharField("Abbreviated Name (ASCII)", max_length=32, null=True, blank=True, help_text="Example: A. Nonymous. Fill in this with initials and surname only if taking the initials and surname of the ASCII name above produces an incorrect initials-only form. (Blank is OK).")
3939
affiliation = models.CharField(max_length=255, blank=True, help_text="Employer, university, sponsor, etc.")
40-
address = models.TextField(max_length=255, blank=True, help_text="Postal mailing address.")
4140
biography = models.TextField(blank=True, help_text="Short biography for use on leadership pages. Use plain text or reStructuredText markup.")
4241
photo = models.ImageField(storage=NoLocationMigrationFileSystemStorage(), upload_to=settings.PHOTOS_DIRNAME, blank=True, default=None)
4342
photo_thumb = models.ImageField(storage=NoLocationMigrationFileSystemStorage(), upload_to=settings.PHOTOS_DIRNAME, blank=True, default=None)

ietf/person/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def merge_persons(source, target, file=sys.stdout, verbose=False):
3434
dedupe_aliases(target)
3535

3636
# copy other attributes
37-
for field in ('ascii','ascii_short','address','affiliation'):
37+
for field in ('ascii','ascii_short','affiliation'):
3838
if getattr(source,field) and not getattr(target,field):
3939
setattr(target,field,getattr(source,field))
4040
target.save()

ietf/secr/rolodex/tests.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ def test_add(self):
4141
'ascii': 'Joe Smith',
4242
'ascii_short': 'Joe S',
4343
'affiliation': 'IETF',
44-
'address': '100 First Ave',
4544
'email': 'joes@exanple.com',
4645
'submit': 'Submit',
4746
}
@@ -63,7 +62,6 @@ def test_edit_replace_user(self):
6362
'ascii': person.ascii,
6463
'ascii_short': person.ascii_short,
6564
'affiliation': person.affiliation,
66-
'address': person.address,
6765
'user': user.username,
6866
'email-0-person':person.pk,
6967
'email-0-address': person.email_address(),

ietf/utils/test_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def make_immutable_base_data():
6060
date4 = TelechatDate.objects.create(date=t + datetime.timedelta(days=14 * 3)).date # pyflakes:ignore
6161

6262
# system
63-
system_person = Person.objects.create(name="(System)", ascii="(System)", address="")
63+
system_person = Person.objects.create(name="(System)", ascii="(System)")
6464
Email.objects.create(address="", person=system_person)
6565

6666
# high-level groups

0 commit comments

Comments
 (0)