From bf7157341f6125a7bb027c01cf3678c325b6acb5 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 26 Jan 2018 20:02:23 +0000 Subject: [PATCH] Merged in [14572] from rjsparks@nostrum.com: Corrected the filter for closed review requests. Fixes #2152. - Legacy-Id: 14573 Note: SVN reference [14572] has been migrated to Git commit 68725913b59d47e2b91e3d03711ff3f5c1ae970b --- ietf/group/views.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ietf/group/views.py b/ietf/group/views.py index 19d6df343..d82ae51e8 100644 --- a/ietf/group/views.py +++ b/ietf/group/views.py @@ -45,6 +45,7 @@ from django import forms from django.conf import settings from django.contrib.auth.decorators import login_required from django.db.models.aggregates import Max +from django.db.models import Q from django.http import HttpResponse, HttpResponseForbidden, Http404, HttpResponseRedirect, JsonResponse from django.shortcuts import render, redirect, get_object_or_404 from django.template.loader import render_to_string @@ -1310,7 +1311,10 @@ def review_requests(request, acronym, group_type=None): "2y": datetime.timedelta(days=2 * 365), }[since] - closed_review_requests = closed_review_requests.filter(time__gte=datetime.date.today() - date_limit) + closed_review_requests = closed_review_requests.filter( + Q(reviewrequestdocevent__type='closed_review_request', reviewrequestdocevent__time__gte=datetime.date.today() - date_limit) + | Q(reviewrequestdocevent__isnull=True, time__gte=datetime.date.today() - date_limit) + ).distinct() return render(request, 'group/review_requests.html', construct_group_menu_context(request, group, "review requests", group_type, {