From 6e264562ee06a72be7b73d4e30edb45c684f39d8 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 25 Jan 2023 21:09:34 -0500 Subject: [PATCH] Use embedded tables for importing/export VRFs & L2VPNs under route target view --- netbox/ipam/views.py | 15 -------- netbox/templates/ipam/routetarget.html | 48 ++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index e3245ef39..c80ca7d74 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -103,21 +103,6 @@ class RouteTargetListView(generic.ObjectListView): class RouteTargetView(generic.ObjectView): queryset = RouteTarget.objects.all() - def get_extra_context(self, request, instance): - importing_vrfs_table = tables.VRFTable( - instance.importing_vrfs.all(), - orderable=False - ) - exporting_vrfs_table = tables.VRFTable( - instance.exporting_vrfs.all(), - orderable=False - ) - - return { - 'importing_vrfs_table': importing_vrfs_table, - 'exporting_vrfs_table': exporting_vrfs_table, - } - @register_model_view(RouteTarget, 'edit') class RouteTargetEditView(generic.ObjectEditView): diff --git a/netbox/templates/ipam/routetarget.html b/netbox/templates/ipam/routetarget.html index ea7a98c97..fae9866b5 100644 --- a/netbox/templates/ipam/routetarget.html +++ b/netbox/templates/ipam/routetarget.html @@ -25,18 +25,54 @@ {% include 'inc/panels/tags.html' %} - {% include 'inc/panels/custom_fields.html' %} - {% include 'inc/panels/comments.html' %} {% plugin_left_page object %}
-
- {% include 'inc/panel_table.html' with table=importing_vrfs_table heading="Importing VRFs" %} -
- {% include 'inc/panel_table.html' with table=exporting_vrfs_table heading="Exporting VRFs" %} + {% include 'inc/panels/custom_fields.html' %} + {% include 'inc/panels/comments.html' %} {% plugin_right_page object %}
+
+
+
+
Importing VRFs
+
+
+
+
+
+
Exporting VRFs
+
+
+
+
+
+
+
+
Importing L2VPNs
+
+
+
+
+
+
Exporting L2VPNs
+
+
+
+
{% plugin_full_width_page object %}