From 193e4e39b1b887e3a1d0f562fa695090ca259d59 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Tue, 18 Aug 2020 17:13:37 +0100
Subject: [PATCH] Split hard and soft dependers on meta package page

---
 app/blueprints/metapackages/__init__.py | 15 ++++++++++++---
 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 %}
-- 
2.44.0