From ca9dd9b61a95322a6a441c00f060679725f00f91 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Thu, 24 Nov 2011 16:37:58 +0000 Subject: [PATCH] Fix bug with states - Legacy-Id: 3703 --- ietf/idrfc/views_search.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ietf/idrfc/views_search.py b/ietf/idrfc/views_search.py index b9cff71cc..a60f61dc5 100644 --- a/ietf/idrfc/views_search.py +++ b/ietf/idrfc/views_search.py @@ -597,9 +597,9 @@ def by_ad(request, name): def all(request): if settings.USE_DB_REDESIGN_PROXY_CLASSES: active = (dict(filename=n) for n in InternetDraft.objects.filter(states__type="draft", states__slug="active").order_by("name").values_list('name', flat=True)) - rfc1 = (dict(filename=d, rfc_number=int(n[3:])) for d, n in DocAlias.objects.filter(document__states__type="draft-iesg", document__states__slug="rfc", name__startswith="rfc").exclude(document__name__startswith="rfc").order_by("document__name").values_list('document__name','name').distinct()) + rfc1 = (dict(filename=d, rfc_number=int(n[3:])) for d, n in DocAlias.objects.filter(document__states__type="draft", document__states__slug="rfc", name__startswith="rfc").exclude(document__name__startswith="rfc").order_by("document__name").values_list('document__name','name').distinct()) rfc2 = (dict(rfc_number=r, draft=None) for r in sorted(int(n[3:]) for n in Document.objects.filter(type="draft", name__startswith="rfc").values_list('name', flat=True))) - dead = InternetDraft.objects.exclude(state__in=("active", "rfc")).select_related("state").order_by("name") + dead = InternetDraft.objects.exclude(states__type="draft", states__slug__in=("active", "rfc")).select_related("states").order_by("name") else: active = InternetDraft.objects.all().filter(status=1).order_by("filename").values('filename') rfc1 = InternetDraft.objects.all().filter(status=3).order_by("filename").values('filename','rfc_number')