From 6d5f22340470af103c9f26857fceb30afc84d4fa Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 21 Nov 2008 17:27:35 +0000 Subject: [PATCH] Fixed IETFWG.area_acronym() so it works, and added IETFWG.area_directors() - Legacy-Id: 1288 --- ietf/idtracker/models.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ietf/idtracker/models.py b/ietf/idtracker/models.py index fa7010c8d..b4db3c43c 100644 --- a/ietf/idtracker/models.py +++ b/ietf/idtracker/models.py @@ -808,7 +808,17 @@ class IETFWG(models.Model): return [(wg.group_acronym_id, wg.group_acronym.acronym) for wg in IETFWG.objects.all().filter(group_type__type='WG').select_related().order_by('acronym.acronym')] choices = staticmethod(choices) def area_acronym(self): - return AreaGroup.objects.filter(group_acronym_id=self.group_acronym_id).area + areas = AreaGroup.objects.filter(group__exact=self.group_acronym) + if areas: + return areas[areas.count()-1].area.area_acronym + else: + return None + def area_directors(self): + areas = AreaGroup.objects.filter(group__exact=self.group_acronym) + if areas: + return areas[areas.count()-1].area.areadirector_set.all() + else: + return None class Meta: db_table = 'groups_ietf' ordering = ['?'] # workaround django wanting to sort by acronym but not joining with it @@ -817,7 +827,7 @@ class IETFWG(models.Model): search_fields = ['group_acronym__acronym', 'group_acronym__name'] # Until the database is consistent, including area_director in # this list means that we'll have FK failures, so skip it for now. - list_display = ('group_acronym', 'group_type', 'status') + list_display = ('group_acronym', 'group_type', 'status', 'area_acronym', 'start_date', 'concluded_date') list_filter = ['status', 'group_type'] #list_display = ('group_acronym', 'group_type', 'status', 'area_director') #list_filter = ['status', 'group_type', 'area_director']