Skip to content

Commit ab68651

Browse files
committed
Make date_threshold into a function. Since it was coded as a static
assignment, it would actually happen when the mod_python thread was initialized, so the value would drift away from being right. Match the I-D tracker implementation by moving it to the first day of the month in which the day that's 185 days ago lives. - Legacy-Id: 565
1 parent 43ae8b8 commit ab68651

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

ietf/iesg/views.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
from django.http import Http404
66
import datetime
77

8-
date_threshold = datetime.datetime.now().date() - datetime.timedelta(days=185)
8+
def date_threshold():
9+
"""Return the first day of the month that is 185 days ago."""
10+
ret = datetime.date.today() - datetime.timedelta(days=185)
11+
ret = ret - datetime.timedelta(days=ret.day - 1)
12+
return ret
913

1014
def inddocs(request):
1115
queryset_list_ind = InternetDraft.objects.filter(idinternal__via_rfc_editor=1, idinternal__rfc_flag=0, idinternal__noproblem=1, idinternal__dnp=0).order_by('-b_approve_date')
@@ -16,11 +20,11 @@ def wgdocs(request,cat):
1620
is_recent = 0
1721
if cat == 'recent':
1822
is_recent = 1
19-
queryset_list = InternetDraft.objects.filter(b_approve_date__gte = date_threshold, intended_status__in=[1,2,6,7],idinternal__via_rfc_editor=0).order_by("-b_approve_date")
20-
queryset_list_doc = InternetDraft.objects.filter(b_approve_date__gte = date_threshold, intended_status__in=[3,5],idinternal__via_rfc_editor=0).order_by("-b_approve_date")
23+
queryset_list = InternetDraft.objects.filter(b_approve_date__gte = date_threshold(), intended_status__in=[1,2,6,7],idinternal__via_rfc_editor=0).order_by("-b_approve_date")
24+
queryset_list_doc = InternetDraft.objects.filter(b_approve_date__gte = date_threshold(), intended_status__in=[3,5],idinternal__via_rfc_editor=0).order_by("-b_approve_date")
2125
elif cat == 'previous':
22-
queryset_list = InternetDraft.objects.filter(b_approve_date__lt = date_threshold, b_approve_date__gte = '1998-10-15', intended_status__in=[1,2,6,7]).order_by("-b_approve_date")
23-
queryset_list_doc = InternetDraft.objects.filter(b_approve_date__lt = date_threshold, b_approve_date__gte = '1998-10-15', intended_status__in=[3,5]).order_by("-b_approve_date")
26+
queryset_list = InternetDraft.objects.filter(b_approve_date__lt = date_threshold(), b_approve_date__gte = '1998-10-15', intended_status__in=[1,2,6,7]).order_by("-b_approve_date")
27+
queryset_list_doc = InternetDraft.objects.filter(b_approve_date__lt = date_threshold(), b_approve_date__gte = '1998-10-15', intended_status__in=[3,5]).order_by("-b_approve_date")
2428
else:
2529
raise Http404
2630
return object_list(request, queryset=queryset_list, template_name='iesg/ietf_doc.html', allow_empty=True, extra_context={'object_list_doc':queryset_list_doc, 'is_recent':is_recent })

0 commit comments

Comments
 (0)