Removed the Person.address field, which is not being used. This was a legacy from the 2001 perl-based datatracker tables. Fixes issue #2504.

- Legacy-Id: 15095
This commit is contained in:
Henrik Levkowetz 2018-04-27 14:00:33 +00:00
parent e177f45f1a
commit 53c4ac36db
9 changed files with 28 additions and 9 deletions

View file

@ -1435,7 +1435,7 @@ class ChangeReplacesTests(TestCase):
expires=datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE), expires=datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
group=mars_wg, group=mars_wg,
) )
p = Person.objects.create(address="basea_author") p = Person.objects.create(name="basea_author")
e = Email.objects.create(address="basea_author@example.com", person=p) e = Email.objects.create(address="basea_author@example.com", person=p)
self.basea.documentauthor_set.create(person=p, email=e, order=1) self.basea.documentauthor_set.create(person=p, email=e, order=1)

View file

@ -207,7 +207,6 @@ class IetfAuthTests(TestCase):
"name": u"Test Nãme", "name": u"Test Nãme",
"ascii": u"Test Name", "ascii": u"Test Name",
"ascii_short": u"T. Name", "ascii_short": u"T. Name",
"address": "Test address",
"affiliation": "Test Org", "affiliation": "Test Org",
"active_emails": email_address, "active_emails": email_address,
} }

View file

@ -694,7 +694,7 @@ class NomcomViewsTest(TestCase):
# check objects # check objects
email = Email.objects.get(address=candidate_email) email = Email.objects.get(address=candidate_email)
Person.objects.get(name=candidate_name, address=candidate_email) Person.objects.get(name=candidate_name)
nominee = Nominee.objects.get(email=email) nominee = Nominee.objects.get(email=email)
NomineePosition.objects.get(position=position, nominee=nominee) NomineePosition.objects.get(position=position, nominee=nominee)
feedback = Feedback.objects.filter(positions__in=[position], feedback = Feedback.objects.filter(positions__in=[position],

View file

@ -375,7 +375,7 @@ def make_nomineeposition_for_newperson(nomcom, candidate_name, candidate_email,
email = Email.objects.create(address=candidate_email) email = Email.objects.create(address=candidate_email)
person = Person.objects.create(name=candidate_name, person = Person.objects.create(name=candidate_name,
ascii=unidecode_name(candidate_name), ascii=unidecode_name(candidate_name),
address=candidate_email) )
email.person = person email.person = person
email.save() email.save()

View file

@ -0,0 +1,23 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.12 on 2018-04-26 05:17
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('person', '0002_auto_20180330_0808'),
]
operations = [
migrations.RemoveField(
model_name='person',
name='address',
),
migrations.RemoveField(
model_name='personhistory',
name='address',
),
]

View file

@ -37,7 +37,6 @@ class PersonInfo(models.Model):
# The short ascii-form of the name. Also in alias table if non-null # The short ascii-form of the name. Also in alias table if non-null
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).") 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).")
affiliation = models.CharField(max_length=255, blank=True, help_text="Employer, university, sponsor, etc.") affiliation = models.CharField(max_length=255, blank=True, help_text="Employer, university, sponsor, etc.")
address = models.TextField(max_length=255, blank=True, help_text="Postal mailing address.")
biography = models.TextField(blank=True, help_text="Short biography for use on leadership pages. Use plain text or reStructuredText markup.") biography = models.TextField(blank=True, help_text="Short biography for use on leadership pages. Use plain text or reStructuredText markup.")
photo = models.ImageField(storage=NoLocationMigrationFileSystemStorage(), upload_to=settings.PHOTOS_DIRNAME, blank=True, default=None) photo = models.ImageField(storage=NoLocationMigrationFileSystemStorage(), upload_to=settings.PHOTOS_DIRNAME, blank=True, default=None)
photo_thumb = models.ImageField(storage=NoLocationMigrationFileSystemStorage(), upload_to=settings.PHOTOS_DIRNAME, blank=True, default=None) photo_thumb = models.ImageField(storage=NoLocationMigrationFileSystemStorage(), upload_to=settings.PHOTOS_DIRNAME, blank=True, default=None)

View file

@ -34,7 +34,7 @@ def merge_persons(source, target, file=sys.stdout, verbose=False):
dedupe_aliases(target) dedupe_aliases(target)
# copy other attributes # copy other attributes
for field in ('ascii','ascii_short','address','affiliation'): for field in ('ascii','ascii_short','affiliation'):
if getattr(source,field) and not getattr(target,field): if getattr(source,field) and not getattr(target,field):
setattr(target,field,getattr(source,field)) setattr(target,field,getattr(source,field))
target.save() target.save()

View file

@ -41,7 +41,6 @@ class RolodexTestCase(TestCase):
'ascii': 'Joe Smith', 'ascii': 'Joe Smith',
'ascii_short': 'Joe S', 'ascii_short': 'Joe S',
'affiliation': 'IETF', 'affiliation': 'IETF',
'address': '100 First Ave',
'email': 'joes@exanple.com', 'email': 'joes@exanple.com',
'submit': 'Submit', 'submit': 'Submit',
} }
@ -63,7 +62,6 @@ class RolodexTestCase(TestCase):
'ascii': person.ascii, 'ascii': person.ascii,
'ascii_short': person.ascii_short, 'ascii_short': person.ascii_short,
'affiliation': person.affiliation, 'affiliation': person.affiliation,
'address': person.address,
'user': user.username, 'user': user.username,
'email-0-person':person.pk, 'email-0-person':person.pk,
'email-0-address': person.email_address(), 'email-0-address': person.email_address(),

View file

@ -60,7 +60,7 @@ def make_immutable_base_data():
date4 = TelechatDate.objects.create(date=t + datetime.timedelta(days=14 * 3)).date # pyflakes:ignore date4 = TelechatDate.objects.create(date=t + datetime.timedelta(days=14 * 3)).date # pyflakes:ignore
# system # system
system_person = Person.objects.create(name="(System)", ascii="(System)", address="") system_person = Person.objects.create(name="(System)", ascii="(System)")
Email.objects.create(address="", person=system_person) Email.objects.create(address="", person=system_person)
# high-level groups # high-level groups