From f49701c9d3817899bf963e062c0da747d84358ac Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Fri, 13 Jan 2012 13:20:28 +0000 Subject: [PATCH] Commit some files missing from the ChangeStateGroupEvent update - Legacy-Id: 3810 --- ietf/announcements/views.py | 10 +++++----- redesign/group/proxy.py | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ietf/announcements/views.py b/ietf/announcements/views.py index d48756393..0ecf13079 100644 --- a/ietf/announcements/views.py +++ b/ietf/announcements/views.py @@ -35,7 +35,7 @@ def nomcom(request): 'regimes' : regimes }) def nomcomREDESIGN(request): - from group.models import Group, ChangeStateGroupEvent + from group.models import Group, GroupEvent from ietf.announcements.models import Message address_re = re.compile("<.*>") @@ -45,12 +45,12 @@ def nomcomREDESIGN(request): regimes = [] for n in nomcoms: - e = n.latest_event(ChangeStateGroupEvent, type="changed_state", state="active") - n.start_year = e.time.year if e else 0 + e = GroupEvent.objects.filter(group=n, type="changed_state", changestategroupevent__state="active").order_by('time')[:1] + n.start_year = e[0].time.year if e else 0 if n.start_year <= 2003: continue - e = n.latest_event(ChangeStateGroupEvent, type="changed_state", state="conclude") - n.end_year = e.time.year if e else "" + e = GroupEvent.objects.filter(group=n, type="changed_state", changestategroupevent__state="conclude").order_by('time')[:1] + n.end_year = e[0].time.year if e else "" chair = n.role_set.select_related().get(name="chair") announcements = Message.objects.filter(related_groups=n).order_by('-time') diff --git a/redesign/group/proxy.py b/redesign/group/proxy.py index 01a0618a9..44bd42542 100644 --- a/redesign/group/proxy.py +++ b/redesign/group/proxy.py @@ -105,7 +105,7 @@ class IETFWG(Group): group_type=lambda v: ("type", { 1: "wg" }[int(v)]), status=lambda v: ("state", { 1: "active" }[int(v)]), areagroup__area__status=lambda v: ("parent__state", { 1: "active" }[v]), - start_date__isnull=lambda v: None if v else ("groupevent__changestategroupevent__state__slug__in", ("proposed", "active")) + start_date__isnull=lambda v: None if v else ("groupevent__changestategroupevent__state__slug", "active"), ), always_filter=dict(type__in=("wg", "individ"))) @@ -125,8 +125,8 @@ class IETFWG(Group): #start_date = models.DateField(null=True, blank=True) @property def start_date(self): - e = self.latest_event(ChangeStateGroupEvent, type="changed_state", state="active") - return e.time.date() if e else None + e = GroupEvent.objects.filter(group=self, type="changed_state", changestategroupevent__state="active").order_by('time')[:1] + return e[0].time.date() if e else None #dormant_date = models.DateField(null=True, blank=True) #concluded_date = models.DateField(null=True, blank=True)