Rename the WgPassword and LiaisonUsers models to make their
legacy status clear. - Legacy-Id: 938
This commit is contained in:
parent
93b1034562
commit
052b774fa6
|
@ -15,13 +15,13 @@
|
|||
#
|
||||
# Data sources:
|
||||
# - IESGLogin
|
||||
# - WgPassword
|
||||
# - LegacyWgPassword
|
||||
# - Liaison tool ('Users')
|
||||
# - Then look for email address
|
||||
#
|
||||
#
|
||||
from ietf.idtracker.models import PersonOrOrgInfo, IESGLogin, EmailAddress
|
||||
from ietf.ietfauth.models import WgPassword, LiaisonUser
|
||||
from ietf.ietfauth.models import LegacyWgPassword, LegacyLiaisonUser
|
||||
from ietf.utils import users
|
||||
from django.core.validators import email_re
|
||||
from django.contrib.auth.models import Group
|
||||
|
@ -57,17 +57,17 @@ while line != '':
|
|||
iesg = None
|
||||
if person is None:
|
||||
try:
|
||||
wg = WgPassword.objects.get(login_name=user)
|
||||
wg = LegacyWgPassword.objects.get(login_name=user)
|
||||
person = wg.person
|
||||
except WgPassword.DoesNotExist:
|
||||
except LegacyWgPassword.DoesNotExist:
|
||||
pass
|
||||
except AssertionError:
|
||||
print "%s has multiple WGPassword rows, so couldn't pick" % user
|
||||
if person is None:
|
||||
try:
|
||||
liaison = LiaisonUser.objects.get(login_name=user)
|
||||
liaison = LegacyLiaisonUser.objects.get(login_name=user)
|
||||
person = liaison.person
|
||||
except LiaisonUser.DoesNotExist:
|
||||
except LegacyLiaisonUser.DoesNotExist:
|
||||
pass
|
||||
if person is None and email:
|
||||
try:
|
||||
|
|
|
@ -23,7 +23,7 @@ class UserMap(models.Model):
|
|||
# legacy per-tool access tables.
|
||||
# ietf.idtracker.models.IESGLogin is in the same vein.
|
||||
|
||||
class LiaisonUser(models.Model):
|
||||
class LegacyLiaisonUser(models.Model):
|
||||
person = models.ForeignKey(PersonOrOrgInfo, db_column='person_or_org_tag', primary_key=True, raw_id_admin=True)
|
||||
login_name = models.CharField(maxlength=255)
|
||||
password = models.CharField(maxlength=25)
|
||||
|
@ -35,7 +35,7 @@ class LiaisonUser(models.Model):
|
|||
db_table = 'users'
|
||||
ordering = ['login_name']
|
||||
|
||||
class WgPassword(models.Model):
|
||||
class LegacyWgPassword(models.Model):
|
||||
person = models.ForeignKey(PersonOrOrgInfo, db_column='person_or_org_tag', primary_key=True, raw_id_admin=True)
|
||||
password = models.CharField(blank=True, maxlength=255)
|
||||
secrete_question_id = models.IntegerField(null=True, blank=True)
|
||||
|
|
Loading…
Reference in a new issue