Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes: #11715 - Fix Parent Prefix table display #12448

Merged
merged 2 commits into from
May 5, 2023
Merged

Fixes: #11715 - Fix Parent Prefix table display #12448

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95486e4
Fixes: #11715 - Fix Parent Prefix table display of global vrf prefixe…
DanSheps May 2, 2023
bfe7e0e
Combine AND into a single Q object
DanSheps May 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion netbox/ipam/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from virtualization.filtersets import VMInterfaceFilterSet
from virtualization.models import VMInterface
from . import filtersets, forms, tables
from .choices import PrefixStatusChoices
from .constants import *
from .models import *
from .tables.l2vpn import L2VPNTable, L2VPNTerminationTable
Expand Down Expand Up @@ -495,7 +496,7 @@ def get_extra_context(self, request, instance):

# Parent prefixes table
parent_prefixes = Prefix.objects.restrict(request.user, 'view').filter(
Q(vrf=instance.vrf) | Q(vrf__isnull=True)
Q(vrf=instance.vrf) | Q(Q(vrf__isnull=True) & Q(status=PrefixStatusChoices.STATUS_CONTAINER))
DanSheps marked this conversation as resolved.
Show resolved Hide resolved
).filter(
prefix__net_contains=str(instance.prefix)
).prefetch_related(
Expand Down