Add forum topic list to meta packages page

diff --git a/app/blueprints/metapackages/__init__.py b/app/blueprints/metapackages/__init__.py
index c5abc3e564b5da692cdac9673de0999a85ebb959..38b2b8183eb420a420555afc28d3d872ba63d762 100644 (file)
--- 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 d768b9bca01266a71fcbb79b0ada3bf5bd207cb0..8bc98959aa71a181cf993f3dc231a837fd7e51b4 100644 (file)
--- 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 %}