Skip to content

Commit 257379a

Browse files
committed
Return context for package views
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent d802717 commit 257379a

1 file changed

Lines changed: 49 additions & 52 deletions

File tree

vulnerabilities/views.py

Lines changed: 49 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -355,69 +355,66 @@ def get_context_data(self, **kwargs):
355355

356356
return context
357357

358-
is_grouped = models.AdvisorySet.objects.filter(package=package).exists()
359-
360-
if is_grouped:
361-
context["grouped"] = True
362-
fixed_pkg_details = get_fixed_package_details(package)
363-
context["fixed_package_details"] = fixed_pkg_details
364-
365-
affected_by_advisories_qs = (
366-
models.AdvisorySet.objects.filter(package=package, relation_type="affecting")
367-
.select_related("primary_advisory")
368-
.prefetch_related(
369-
Prefetch(
370-
"members",
371-
queryset=AdvisorySetMember.objects.filter(is_primary=False).select_related(
372-
"advisory"
373-
),
374-
to_attr="secondary_members",
375-
)
358+
context["grouped"] = True
359+
fixed_pkg_details = get_fixed_package_details(package)
360+
context["fixed_package_details"] = fixed_pkg_details
361+
362+
affected_by_advisories_qs = (
363+
models.AdvisorySet.objects.filter(package=package, relation_type="affecting")
364+
.select_related("primary_advisory")
365+
.prefetch_related(
366+
Prefetch(
367+
"members",
368+
queryset=AdvisorySetMember.objects.filter(is_primary=False).select_related(
369+
"advisory"
370+
),
371+
to_attr="secondary_members",
376372
)
377373
)
374+
)
378375

379-
fixing_advisories_qs = (
380-
models.AdvisorySet.objects.filter(package=package, relation_type="fixing")
381-
.select_related("primary_advisory")
382-
.prefetch_related(
383-
Prefetch(
384-
"members",
385-
queryset=AdvisorySetMember.objects.filter(is_primary=False).select_related(
386-
"advisory"
387-
),
388-
to_attr="secondary_members",
389-
)
376+
fixing_advisories_qs = (
377+
models.AdvisorySet.objects.filter(package=package, relation_type="fixing")
378+
.select_related("primary_advisory")
379+
.prefetch_related(
380+
Prefetch(
381+
"members",
382+
queryset=AdvisorySetMember.objects.filter(is_primary=False).select_related(
383+
"advisory"
384+
),
385+
to_attr="secondary_members",
390386
)
391387
)
388+
)
392389

393-
affected_groups = [
394-
(
395-
Group(
396-
aliases=list(adv.aliases.all()),
397-
primary=adv.primary_advisory,
398-
secondaries=[a.advisory for a in adv.secondary_members],
399-
)
390+
affected_groups = [
391+
(
392+
Group(
393+
aliases=list(adv.aliases.all()),
394+
primary=adv.primary_advisory,
395+
secondaries=[a.advisory for a in adv.secondary_members],
400396
)
401-
for adv in affected_by_advisories_qs
402-
]
403-
fixing_groups = [
404-
(
405-
Group(
406-
aliases=list(adv.aliases.all()),
407-
primary=adv.primary_advisory,
408-
secondaries=[a.advisory for a in adv.secondary_members],
409-
)
397+
)
398+
for adv in affected_by_advisories_qs
399+
]
400+
fixing_groups = [
401+
(
402+
Group(
403+
aliases=list(adv.aliases.all()),
404+
primary=adv.primary_advisory,
405+
secondaries=[a.advisory for a in adv.secondary_members],
410406
)
411-
for adv in fixing_advisories_qs
412-
]
407+
)
408+
for adv in fixing_advisories_qs
409+
]
413410

414-
affected_advisories: List[GroupedAdvisory] = get_advisories_from_groups(affected_groups)
415-
fixing_advisories: List[GroupedAdvisory] = get_advisories_from_groups(fixing_groups)
411+
affected_advisories: List[GroupedAdvisory] = get_advisories_from_groups(affected_groups)
412+
fixing_advisories: List[GroupedAdvisory] = get_advisories_from_groups(fixing_groups)
416413

417-
context["affected_by_advisories_v2"] = affected_advisories
418-
context["fixing_advisories_v2"] = fixing_advisories
414+
context["affected_by_advisories_v2"] = affected_advisories
415+
context["fixing_advisories_v2"] = fixing_advisories
419416

420-
return context
417+
return context
421418

422419
def get_object(self, queryset=None):
423420
if queryset is None:

0 commit comments

Comments
 (0)