From 2971f286e7e0d69ad7a13844f2d58f8429b39c37 Mon Sep 17 00:00:00 2001 From: Tushar Goel Date: Mon, 1 Jan 2024 19:36:35 +0530 Subject: [PATCH] Fix package details view template Signed-off-by: Tushar Goel --- .../templates/package_details.html | 110 +++++++++--------- vulnerabilities/views.py | 1 - 2 files changed, 57 insertions(+), 54 deletions(-) diff --git a/vulnerabilities/templates/package_details.html b/vulnerabilities/templates/package_details.html index e0765815f..ed10cd122 100644 --- a/vulnerabilities/templates/package_details.html +++ b/vulnerabilities/templates/package_details.html @@ -42,8 +42,12 @@
-
-
+
+ {% if affected_by_vulnerabilities|length == 0 %} +
+ {% else %} +
+ {% endif %} @@ -61,10 +65,10 @@
- {% if affected_by_vulnerabilities|length != 0 %} + {% if affected_by_vulnerabilities|length == 0 %} -
- +
+
@@ -98,8 +102,8 @@ {% endif %} -
-
+
+
Vulnerabilities affecting this package ({{ affected_by_vulnerabilities|length }})
@@ -145,56 +149,56 @@ class="affected-fixed">fixed by versions. {% else %} {% for fixed_pkg in vuln.fixed_by_package_details %} -
- {% if fixed_pkg.fixed_by_purl_vulnerabilities|length == 0 %} - {{ fixed_pkg.fixed_by_purl.version }} -
- Affected - by 0 other vulnerabilities. - {% else %} - {{ fixed_pkg.fixed_by_purl.version }} - {% if fixed_pkg.fixed_by_purl_vulnerabilities|length != 1 %} -
- Affected - by {{ fixed_pkg.fixed_by_purl_vulnerabilities|length }} other - vulnerabilities. - {% else %} -
- Affected - by {{ fixed_pkg.fixed_by_purl_vulnerabilities|length }} other - vulnerability. - {% endif %} - -
-
- -
-
-
-
+
+
Vulnerabilities fixed by this package ({{ fixing_vulnerabilities|length }})
diff --git a/vulnerabilities/views.py b/vulnerabilities/views.py index cc6c79cb5..026ce1b09 100644 --- a/vulnerabilities/views.py +++ b/vulnerabilities/views.py @@ -86,7 +86,6 @@ class PackageDetails(DetailView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - print(context) package = self.object context["package"] = package context["affected_by_vulnerabilities"] = package.affected_by.order_by("vulnerability_id")