Skip to content

Commit 5c93ea8

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

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
@@ -354,69 +354,66 @@ def get_context_data(self, **kwargs):
354354

355355
return context
356356

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

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

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

413-
affected_advisories: List[GroupedAdvisory] = get_advisories_from_groups(affected_groups)
414-
fixing_advisories: List[GroupedAdvisory] = get_advisories_from_groups(fixing_groups)
410+
affected_advisories: List[GroupedAdvisory] = get_advisories_from_groups(affected_groups)
411+
fixing_advisories: List[GroupedAdvisory] = get_advisories_from_groups(fixing_groups)
415412

416-
context["affected_by_advisories_v2"] = affected_advisories
417-
context["fixing_advisories_v2"] = fixing_advisories
413+
context["affected_by_advisories_v2"] = affected_advisories
414+
context["fixing_advisories_v2"] = fixing_advisories
418415

419-
return context
416+
return context
420417

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

0 commit comments

Comments
 (0)