From 53babc1113c1fd8352c5572c763fda5e4a1ca380 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Fri, 29 Jan 2021 22:35:41 +0000 Subject: [PATCH] Fix outdated packages page query --- app/blueprints/todo/__init__.py | 9 +++++---- app/templates/todo/outdated.html | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/blueprints/todo/__init__.py b/app/blueprints/todo/__init__.py index 486b799..bc1d5dd 100644 --- a/app/blueprints/todo/__init__.py +++ b/app/blueprints/todo/__init__.py @@ -182,9 +182,10 @@ def view_user(username=None): @bp.route("/todo/outdated/") @login_required def outdated(): - outdated_packages = Package.query \ - .filter(Package.state == PackageState.APPROVED, - Package.update_config.has(PackageUpdateConfig.outdated_at.isnot(None)))\ - .order_by(db.desc(PackageUpdateConfig.outdated_at)).all() + outdated_packages = db.session.query(Package).select_from(PackageUpdateConfig) \ + .filter(PackageUpdateConfig.outdated_at.isnot(None)) \ + .order_by(db.desc(PackageUpdateConfig.outdated_at)) \ + .join(PackageUpdateConfig.package) \ + .filter(Package.state == PackageState.APPROVED).all() return render_template("todo/outdated.html", current_tab="outdated", outdated_packages=outdated_packages) diff --git a/app/templates/todo/outdated.html b/app/templates/todo/outdated.html index 2dbd98a..2e55131 100644 --- a/app/templates/todo/outdated.html +++ b/app/templates/todo/outdated.html @@ -1,12 +1,10 @@ {% extends "todo/todo_base.html" %} {% block title %} - {{ _("Outdated packages") }} + {{ _("All Outdated packages") }} {% endblock %} {% block content %} -

{{ self.title() }}

- {% from "macros/todo.html" import render_outdated_packages %} {{ render_outdated_packages(outdated_packages) }} {% endblock %}