From 37a2d902a58ed61f8a2a9ea33a0fe3f3a050ec0a Mon Sep 17 00:00:00 2001 From: Jason Novinger Date: Mon, 7 Apr 2025 15:24:24 -0500 Subject: [PATCH] Address PR feedback, add Services to FHRP Group related objects --- netbox/ipam/views.py | 14 +++++++++++++- netbox/templates/ipam/fhrpgroup.html | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 2e70ed43c..fbfde7e38 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -1161,7 +1161,7 @@ class FHRPGroupListView(generic.ObjectListView): @register_model_view(FHRPGroup) -class FHRPGroupView(generic.ObjectView): +class FHRPGroupView(GetRelatedModelsMixin, generic.ObjectView): queryset = FHRPGroup.objects.all() def get_extra_context(self, request, instance): @@ -1173,6 +1173,18 @@ class FHRPGroupView(generic.ObjectView): members_table.columns.hide('group') return { + 'related_models': self.get_related_models( + request, instance, + extra=( + ( + Service.objects.restrict(request.user, 'view').filter( + parent_object_type=ContentType.objects.get_for_model(FHRPGroup), + parent_object_id=instance.id, + ), + 'fhrpgroup_id' + ), + ), + ), 'members_table': members_table, 'member_count': FHRPGroupAssignment.objects.filter(group=instance).count(), } diff --git a/netbox/templates/ipam/fhrpgroup.html b/netbox/templates/ipam/fhrpgroup.html index 943b11bb8..ed4dadb78 100644 --- a/netbox/templates/ipam/fhrpgroup.html +++ b/netbox/templates/ipam/fhrpgroup.html @@ -58,6 +58,7 @@ + {% include 'inc/panels/related_objects.html' %} {% include 'inc/panels/custom_fields.html' %} {% plugin_right_page object %}