From 506974a50da2aa6004b17ae3bccd4f7c79db731d Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Tue, 18 Aug 2020 16:42:33 +0100 Subject: Add forum topic list to meta packages page --- app/blueprints/metapackages/__init__.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'app/blueprints') diff --git a/app/blueprints/metapackages/__init__.py b/app/blueprints/metapackages/__init__.py index c5abc3e..38b2b81 100644 --- a/app/blueprints/metapackages/__init__.py +++ b/app/blueprints/metapackages/__init__.py @@ -41,6 +41,15 @@ def view(name): .filter(MetaPackage.name==name) \ .join(MetaPackage.dependencies) \ .join(Dependency.depender) \ + .filter(Package.approved==True, Package.soft_deleted==False) \ .all() - return render_template("metapackages/view.html", mpackage=mpackage, dependers=dependers) + similar_topics = None + if mpackage.packages.filter_by(approved=True, soft_deleted=False).count() == 0: + similar_topics = ForumTopic.query \ + .filter_by(name=name) \ + .order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \ + .all() + + return render_template("metapackages/view.html", \ + mpackage=mpackage, dependers=dependers, similar_topics=similar_topics) -- cgit v1.2.3