altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Add static method Areas.active_area_choices() for choice fields

Browse source 
Find business name or department from postal_addresses if there is
 no first or last name for person_or_org_info's __str__.
 - Legacy-Id: 146
This commit is contained in:
Bill Fenner 2007-05-22 19:50:52 +00:00
parent 56f5fb5a98
commit 1a5402da0b
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ietf/idtracker/models.py
View file

@ -75,6 +75,9 @@ class Areas(models.Model):
extra_email_addresses = models.TextField(blank=True) extra_email_addresses = models.TextField(blank=True)
def __str__(self): def __str__(self):
return self.area_acronym.acronym return self.area_acronym.acronym
def active_area_choices():
return [(area.area_acronym_id, area.area_acronym.acronym) for area in Areas.objects.filter(status=1).select_related().order_by('acronym.acronym')]
active_area_choices = staticmethod(active_area_choices)
class Meta: class Meta:
db_table = 'areas' db_table = 'areas'
#ordering = ['area_acronym_id'] #ordering = ['area_acronym_id']
@ -197,6 +200,14 @@ class PersonOrOrgInfo(models.Model):
self.last_name_key = self.last_name.upper() self.last_name_key = self.last_name.upper()
super(PersonOrOrgInfo, self).save() super(PersonOrOrgInfo, self).save()
def __str__(self): def __str__(self):
if self.first_name == '' and self.last_name == '':
try:
postal = self.postaladdress_set.get(address_priority=1)
except PostalAddress.DoesNotExist:
return "PersonOrOrgInfo with no name, no postal address!"
except AssertionError:
return "PersonOrOrgInfo with multiple priority-1 addresses!"
return "%s" % ( postal.affiliated_company or postal.department or "???" )
return "%s %s" % ( self.first_name or "<nofirst>", self.last_name or "<nolast>") return "%s %s" % ( self.first_name or "<nofirst>", self.last_name or "<nolast>")
class Meta: class Meta:
db_table = 'person_or_org_info' db_table = 'person_or_org_info'