From 02d0eb698d1edb01a7ff8cade319389705474384 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 24 Mar 2011 10:07:46 +0000 Subject: [PATCH] Show user levels as more than numbers in the IESG login table. Add utility methods for use in the admin interface. - Legacy-Id: 2908 --- ietf/ietfauth/models.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ietf/ietfauth/models.py b/ietf/ietfauth/models.py index 92fd40993..7f97c8853 100644 --- a/ietf/ietfauth/models.py +++ b/ietf/ietfauth/models.py @@ -35,7 +35,7 @@ from django.db import models from django.contrib.auth.models import User from ietf.idtracker.models import PersonOrOrgInfo, IESGLogin - +from ietf.utils.admin import admin_link def find_person(username): try: @@ -79,16 +79,24 @@ class IetfUserProfile(models.Model): # ietf.idtracker.models.IESGLogin is in the same vein. class LegacyLiaisonUser(models.Model): + USER_LEVEL_CHOICES = ( + (0, 'Secretariat'), + (1, 'IESG'), + (2, 'ex-IESG'), + (3, 'Level 3'), + (4, 'Comment Only(?)'), + ) person = models.ForeignKey(PersonOrOrgInfo, db_column='person_or_org_tag', primary_key=True) login_name = models.CharField(max_length=255) - password = models.CharField(max_length=25) - user_level = models.IntegerField(null=True, blank=True) + password = models.CharField(max_length=25, blank=True, editable=False) + user_level = models.IntegerField(null=True, blank=True, choices=USER_LEVEL_CHOICES) comment = models.TextField(blank=True,null=True) def __str__(self): return self.login_name class Meta: db_table = 'users' ordering = ['login_name'] + person_link = admin_link('person') class LegacyWgPassword(models.Model): person = models.ForeignKey(PersonOrOrgInfo, db_column='person_or_org_tag', primary_key=True) @@ -104,6 +112,7 @@ class LegacyWgPassword(models.Model): class Meta: db_table = 'wg_password' ordering = ['login_name'] + person_link = admin_link('person') # changes done by convert-096.py:changed maxlength to max_length # removed core