diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 26be09004..32c06818f 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -3397,20 +3397,6 @@ class PowerPanelListView(generic.ObjectListView): class PowerPanelView(generic.ObjectView): queryset = PowerPanel.objects.all() - def get_extra_context(self, request, instance): - power_feeds = PowerFeed.objects.restrict(request.user).filter(power_panel=instance) - powerfeed_table = tables.PowerFeedTable( - data=power_feeds, - orderable=False - ) - if request.user.has_perm('dcim.delete_cable'): - powerfeed_table.columns.show('pk') - powerfeed_table.exclude = ['power_panel'] - - return { - 'powerfeed_table': powerfeed_table, - } - @register_model_view(PowerPanel, 'edit') class PowerPanelEditView(generic.ObjectEditView): diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 4007b018c..02a9d2206 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -1200,10 +1200,6 @@ class L2VPNView(generic.ObjectView): queryset = L2VPN.objects.all() def get_extra_context(self, request, instance): - terminations = L2VPNTermination.objects.restrict(request.user, 'view').filter(l2vpn=instance) - terminations_table = tables.L2VPNTerminationTable(terminations, user=request.user, exclude=('l2vpn', )) - terminations_table.configure(request) - import_targets_table = tables.RouteTargetTable( instance.import_targets.prefetch_related('tenant'), orderable=False @@ -1214,7 +1210,6 @@ class L2VPNView(generic.ObjectView): ) return { - 'terminations_table': terminations_table, 'import_targets_table': import_targets_table, 'export_targets_table': export_targets_table, } diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html index 16bd82cc0..c73e33b13 100644 --- a/netbox/templates/dcim/powerpanel.html +++ b/netbox/templates/dcim/powerpanel.html @@ -45,40 +45,42 @@
-
-
- {% csrf_token %} -
-
- {% render_table powerfeed_table 'inc/table.html' %} -
- +
+ + {% csrf_token %} +
+
Power Feeds
+
+ + {% endif %} +
+
+ + {% plugin_full_width_page object %} +
{% endblock %} diff --git a/netbox/templates/ipam/l2vpn.html b/netbox/templates/ipam/l2vpn.html index 4ffda2c98..87050eb26 100644 --- a/netbox/templates/ipam/l2vpn.html +++ b/netbox/templates/ipam/l2vpn.html @@ -55,9 +55,10 @@
Terminations
-
- {% render_table terminations_table 'inc/table.html' %} -
+
{% if perms.ipam.add_l2vpntermination %}