diff options
| author | rubenwardy <rw@rubenwardy.com> | 2020-08-18 16:42:33 +0100 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2020-08-18 16:42:33 +0100 |
| commit | 506974a50da2aa6004b17ae3bccd4f7c79db731d (patch) | |
| tree | ed25c315c5bc9a6afae44182c880bf030a603333 | |
| parent | 996ba8266331f0a6b8ea3251bff30ea0e365a584 (diff) | |
| download | cheatdb-506974a50da2aa6004b17ae3bccd4f7c79db731d.tar.xz | |
Add forum topic list to meta packages page
| -rw-r--r-- | app/blueprints/metapackages/__init__.py | 11 | ||||
| -rw-r--r-- | app/templates/metapackages/view.html | 15 |
2 files changed, 25 insertions, 1 deletions
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) diff --git a/app/templates/metapackages/view.html b/app/templates/metapackages/view.html index d768b9b..8bc9895 100644 --- a/app/templates/metapackages/view.html +++ b/app/templates/metapackages/view.html @@ -12,6 +12,21 @@ {% from "macros/packagegridtile.html" import render_pkggrid %} {{ render_pkggrid(mpackage.packages.filter_by(approved=True, soft_deleted=False).all()) }} + {% if similar_topics %} + <p>Unforuntately, this isn't on ContentDB yet! Here's some forum topics:</p> + <ul> + {% for t in similar_topics %} + <li> + [{{ t.type.value }}] + <a href="https://forum.minetest.net/viewtopic.php?t={{ t.topic_id }}"> + {{ t.title }} by {{ t.author.display_name }} + </a> + {% if t.wip %}[WIP]{% endif %} + </li> + {% endfor %} + </ul> + {% endif %} + <h2>Required / Used by</h2> {{ render_pkggrid(dependers) }} {% endblock %} |