diff options
| author | rubenwardy <rw@rubenwardy.com> | 2020-08-18 17:13:37 +0100 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2020-08-18 17:13:37 +0100 |
| commit | 193e4e39b1b887e3a1d0f562fa695090ca259d59 (patch) | |
| tree | 36e6c827bf025184c5df6ee08a638fecf90499be /app | |
| parent | ab7d5a3feb956774a6cbc2915a13ecc173500148 (diff) | |
| download | cheatdb-193e4e39b1b887e3a1d0f562fa695090ca259d59.tar.xz | |
Split hard and soft dependers on meta package page
Diffstat (limited to 'app')
| -rw-r--r-- | app/blueprints/metapackages/__init__.py | 15 | ||||
| -rw-r--r-- | app/templates/metapackages/view.html | 7 |
2 files changed, 17 insertions, 5 deletions
diff --git a/app/blueprints/metapackages/__init__.py b/app/blueprints/metapackages/__init__.py index 7cfafed..896a260 100644 --- a/app/blueprints/metapackages/__init__.py +++ b/app/blueprints/metapackages/__init__.py @@ -41,7 +41,15 @@ def view(name): .filter(MetaPackage.name==name) \ .join(MetaPackage.dependencies) \ .join(Dependency.depender) \ - .filter(Package.approved==True, Package.soft_deleted==False) \ + .filter(Dependency.optional==False, Package.approved==True, Package.soft_deleted==False) \ + .all() + + optional_dependers = db.session.query(Package) \ + .select_from(MetaPackage) \ + .filter(MetaPackage.name==name) \ + .join(MetaPackage.dependencies) \ + .join(Dependency.depender) \ + .filter(Dependency.optional==True, Package.approved==True, Package.soft_deleted==False) \ .all() similar_topics = None @@ -51,5 +59,6 @@ def view(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) + return render_template("metapackages/view.html", mpackage=mpackage, \ + dependers=dependers, optional_dependers=optional_dependers, \ + similar_topics=similar_topics) diff --git a/app/templates/metapackages/view.html b/app/templates/metapackages/view.html index 8bc9895..08a4674 100644 --- a/app/templates/metapackages/view.html +++ b/app/templates/metapackages/view.html @@ -7,7 +7,7 @@ {% block content %} <h1>Meta Package "{{ mpackage.name }}"</h1> - <h2>Provided by</h2> + <h2>Provided By</h2> {% from "macros/packagegridtile.html" import render_pkggrid %} {{ render_pkggrid(mpackage.packages.filter_by(approved=True, soft_deleted=False).all()) }} @@ -27,6 +27,9 @@ </ul> {% endif %} - <h2>Required / Used by</h2> + <h2>Required By</h2> {{ render_pkggrid(dependers) }} + + <h2>Optionally Used By</h2> + {{ render_pkggrid(optional_dependers) }} {% endblock %} |