From 052b774fa6ade7cf41ad586079578489f5c3c6d1 Mon Sep 17 00:00:00 2001 From: Bill Fenner Date: Tue, 18 Sep 2007 18:31:42 +0000 Subject: [PATCH] Rename the WgPassword and LiaisonUsers models to make their legacy status clear. - Legacy-Id: 938 --- ietf/bin/import-users | 12 ++++++------ ietf/ietfauth/models.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ietf/bin/import-users b/ietf/bin/import-users index 483c21a86..926bf194d 100755 --- a/ietf/bin/import-users +++ b/ietf/bin/import-users @@ -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: diff --git a/ietf/ietfauth/models.py b/ietf/ietfauth/models.py index 6689e734f..aa0087c10 100644 --- a/ietf/ietfauth/models.py +++ b/ietf/ietfauth/models.py @@ -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)