Skip to content

Commit 638dd69

Browse files
committed
Fix views for ungrouped advisories
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent a91237e commit 638dd69

File tree

2 files changed

+28
-10
lines changed

2 files changed

+28
-10
lines changed

vulnerabilities/templates/package_details_v2.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -211,15 +211,15 @@
211211
{% for advisory in affected_by_advisories_v2 %}
212212
<tr>
213213
<td>
214-
<a href="{{advisory.get_absolute_url}}">
214+
<a href="{{advisory.advisory.get_absolute_url}}">
215215
{{advisory.advisory_id }}
216216
</a>
217217
<br />
218-
{% if advisory.aliases.all|length != 0 %}
218+
{% if advisory.advisory.aliases.all|length != 0 %}
219219
Aliases:
220220
{% endif %}
221221
<br />
222-
{% for alias in advisory.aliases.all %}
222+
{% for alias in advisory.advisory.aliases.all %}
223223
{% if alias.url %}
224224
<a href="{{ alias.url }}" target="_blank">{{ alias }}<i
225225
class="fa fa-external-link fa_link_custom"></i></a>
@@ -232,10 +232,10 @@
232232

233233
</td>
234234
<td style="word-wrap: break-word; word-break: break-word;">
235-
{{ advisory.summary|truncatewords:20 }}
235+
{{ advisory.advisory.summary|truncatewords:20 }}
236236
</td>
237237
<td style="word-wrap: break-word; word-break: break-all;">
238-
{% with fixed=fixed_package_details|get_item:advisory.avid %}
238+
{% with fixed=fixed_package_details|get_item:advisory.advisory.avid %}
239239
{% if fixed %}
240240
{% for item in fixed %}
241241
<section>
@@ -336,16 +336,16 @@
336336
{% for advisory in fixing_advisories_v2 %}
337337
<tr>
338338
<td>
339-
<a href="{{advisory.get_absolute_url}}">
339+
<a href="{{advisory.advisory.get_absolute_url}}">
340340
{{advisory.advisory_id }}
341341
</a>
342342
<br />
343343
</td>
344344
<td>
345-
{{ advisory.summary|truncatewords:20 }}
345+
{{ advisory.advisory.summary|truncatewords:20 }}
346346
</td>
347347
<td>
348-
{% for alias in advisory.aliases.all %}
348+
{% for alias in advisory.advisory.aliases.all %}
349349
{% if alias.url %}
350350
<a href="{{ alias.url }}" target="_blank">{{ alias }}<i
351351
class="fa fa-external-link fa_link_custom"></i></a>

vulnerabilities/views.py

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,15 @@ def get_context_data(self, **kwargs):
245245
else:
246246
fixed_pkg_details = get_fixed_package_details(package)
247247
context["fixed_package_details"] = fixed_pkg_details
248-
context["affected_by_advisories_v2"] = affecting_advisories
248+
affecting_advs = []
249+
for adv in affecting_advisories:
250+
affecting_advs.append(
251+
{
252+
"advisory_id": adv.advisory_id.split("/")[-1],
253+
"advisory": adv,
254+
}
255+
)
256+
context["affected_by_advisories_v2"] = affecting_advs
249257
context["affected_by_advisories_v2_url"] = None
250258

251259
fixing_advisories = list(fixing_advisories_qs_ids[:101])
@@ -257,7 +265,17 @@ def get_context_data(self, **kwargs):
257265
context["fixing_advisories_v2"] = []
258266

259267
else:
260-
context["fixing_advisories_v2"] = fixed_by_advisories
268+
fixed_by_advisories = fixed_by_advisories.prefetch_related(
269+
"aliases",
270+
)
271+
fixed_by_advisories = list(fixed_by_advisories)
272+
fix_advs = []
273+
for fixed_by_adv in fixed_by_advisories:
274+
fix_advs.append(
275+
{"advisory_id": fixed_by_adv.advisory_id.split("/")[-1], "advisory": fixed_by_adv}
276+
)
277+
278+
context["fixing_advisories_v2"] = fix_advs
261279

262280
return context
263281

0 commit comments

Comments
 (0)