From b0eea001813bf3af59d419a5a9221e37fc81c818 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Mon, 3 Jan 2022 22:32:14 -0800 Subject: [PATCH] fix(pkgbase.util): filter pending requests Closes #229 Signed-off-by: Kevin Morris --- aurweb/pkgbase/util.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/aurweb/pkgbase/util.py b/aurweb/pkgbase/util.py index 945f0ed6..76b8a8c9 100644 --- a/aurweb/pkgbase/util.py +++ b/aurweb/pkgbase/util.py @@ -1,12 +1,13 @@ from typing import Any, Dict, List from fastapi import Request +from sqlalchemy import and_ from aurweb import config, db, l10n, util from aurweb.models import PackageBase, User from aurweb.models.package_comaintainer import PackageComaintainer from aurweb.models.package_comment import PackageComment -from aurweb.models.package_request import PackageRequest +from aurweb.models.package_request import PENDING_ID, PackageRequest from aurweb.models.package_vote import PackageVote from aurweb.scripts import notify from aurweb.templates import make_context as _make_context @@ -43,7 +44,8 @@ def make_context(request: Request, pkgbase: PackageBase) -> Dict[str, Any]: ).scalar() context["requests"] = pkgbase.requests.filter( - PackageRequest.ClosedTS.is_(None) + and_(PackageRequest.Status == PENDING_ID, + PackageRequest.ClosedTS.is_(None)) ).count() return context