From 92cb97c5eb0214d5bc74a9ad4e525ae5dc01fb2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= Date: Tue, 1 Dec 2020 12:43:38 +0100 Subject: [PATCH] Repair sorting (fixes #155) --- app/main/routes.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/main/routes.py b/app/main/routes.py index 687c63b..70d0dda 100644 --- a/app/main/routes.py +++ b/app/main/routes.py @@ -99,8 +99,8 @@ def range_view(): return Response(output.getvalue(), mimetype='image/png') -@bp.route("/receivers.html") -@cache.cached() +@bp.route("/receivers.html", methods=["GET", "POST"]) +@cache.cached(query_string=True) def receivers(): sel_country = request.args.get("country") @@ -109,12 +109,11 @@ def receivers(): # Get receiver selection list if sel_country: receivers = db.session.query(Receiver) \ - .options(db.joinedload(Receiver.airport)) \ + .join(Country) \ .filter(db.and_(Receiver.country_id == Country.gid, Country.iso2 == sel_country)) \ .order_by(Receiver.name) else: receivers = db.session.query(Receiver) \ - .options(db.joinedload(Receiver.airport)) \ .order_by(Receiver.name) return render_template("receivers.html", title="Receivers", sel_country=sel_country, countries=countries, receivers=receivers)