diff options
author | rubenwardy <rw@rubenwardy.com> | 2020-08-18 16:29:51 +0100 |
---|---|---|
committer | rubenwardy <rw@rubenwardy.com> | 2020-08-18 16:29:51 +0100 |
commit | 996ba8266331f0a6b8ea3251bff30ea0e365a584 (patch) | |
tree | a25252618828fb1c7e55c2ccb6f6f663faec016c | |
parent | 68524adadfd93f31c08ed20a717ea4daf0516420 (diff) | |
download | cheatdb-996ba8266331f0a6b8ea3251bff30ea0e365a584.tar.xz |
Add list of dependers to meta package page
Fixes #229
-rw-r--r-- | app/blueprints/metapackages/__init__.py | 11 | ||||
-rw-r--r-- | app/templates/macros/packagegridtile.html | 2 | ||||
-rw-r--r-- | app/templates/metapackages/list.html (renamed from app/templates/meta/list.html) | 0 | ||||
-rw-r--r-- | app/templates/metapackages/view.html (renamed from app/templates/meta/view.html) | 9 |
4 files changed, 17 insertions, 5 deletions
diff --git a/app/blueprints/metapackages/__init__.py b/app/blueprints/metapackages/__init__.py index 6d32e65..c5abc3e 100644 --- a/app/blueprints/metapackages/__init__.py +++ b/app/blueprints/metapackages/__init__.py @@ -28,7 +28,7 @@ def list_all(): .select_from(MetaPackage).outerjoin(MetaPackage.packages) \ .order_by(db.asc(MetaPackage.name)) \ .group_by(MetaPackage.id).all() - return render_template("meta/list.html", mpackages=mpackages) + return render_template("metapackages/list.html", mpackages=mpackages) @bp.route("/metapackages/<name>/") def view(name): @@ -36,4 +36,11 @@ def view(name): if mpackage is None: abort(404) - return render_template("meta/view.html", mpackage=mpackage) + dependers = db.session.query(Package) \ + .select_from(MetaPackage) \ + .filter(MetaPackage.name==name) \ + .join(MetaPackage.dependencies) \ + .join(Dependency.depender) \ + .all() + + return render_template("metapackages/view.html", mpackage=mpackage, dependers=dependers) diff --git a/app/templates/macros/packagegridtile.html b/app/templates/macros/packagegridtile.html index 3066194..3f9d364 100644 --- a/app/templates/macros/packagegridtile.html +++ b/app/templates/macros/packagegridtile.html @@ -37,7 +37,7 @@ {% for p in packages %} {{ render_pkgtile(p, show_author) }} {% else %} - <li><i>No packages available</i></ul> + <li class="packagetile flex-fill"><i>No packages available</i></li> {% endfor %} {% if packages %} {% for i in range(4) %} diff --git a/app/templates/meta/list.html b/app/templates/metapackages/list.html index a2a468c..a2a468c 100644 --- a/app/templates/meta/list.html +++ b/app/templates/metapackages/list.html diff --git a/app/templates/meta/view.html b/app/templates/metapackages/view.html index 46c5324..d768b9b 100644 --- a/app/templates/meta/view.html +++ b/app/templates/metapackages/view.html @@ -1,12 +1,17 @@ {% extends "base.html" %} {% block title %} -Packages providing '{{ mpackage.name }}'' +{{ mpackage.name }} - Meta Packages {% endblock %} {% block content %} - <h1>Packages providing '{{ mpackage.name }}'</h1> + <h1>Meta Package "{{ mpackage.name }}"</h1> + + <h2>Provided by</h2> {% from "macros/packagegridtile.html" import render_pkggrid %} {{ render_pkggrid(mpackage.packages.filter_by(approved=True, soft_deleted=False).all()) }} + + <h2>Required / Used by</h2> + {{ render_pkggrid(dependers) }} {% endblock %} |