From fee7e41ae48594e90f5efb945684799b76f56772 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Thu, 20 Jan 2022 09:04:55 -0800 Subject: [PATCH] fix(routers.html): show comaintained packages which have been flagged Signed-off-by: Kevin Morris --- aurweb/routers/html.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py index 74901762..74df62f7 100644 --- a/aurweb/routers/html.py +++ b/aurweb/routers/html.py @@ -138,9 +138,15 @@ async def index(request: Request): packages = db.query(models.Package).join(models.PackageBase) maintained = packages.join( - models.User, models.PackageBase.MaintainerUID == models.User.ID + models.PackageComaintainer, + models.PackageComaintainer.PackageBaseID == models.PackageBase.ID, + isouter=True + ).join( + models.User, + or_(models.PackageBase.MaintainerUID == models.User.ID, + models.PackageComaintainer.UsersID == models.User.ID) ).filter( - models.PackageBase.MaintainerUID == request.user.ID + models.User.ID == request.user.ID ) # Packages maintained by the user that have been flagged.