From 010179742cdfa79b09e24986510db9a97b901c5c Mon Sep 17 00:00:00 2001
From: mattieserver <3049868+mattieserver@users.noreply.github.com>
Date: Fri, 16 Sep 2022 14:50:24 +0200
Subject: [PATCH] 159 fix power filter (#164)

* fix site_ids var

* fixed power cable name + change power filter name
---
 netbox_topology_views/forms.py |  2 +-
 netbox_topology_views/views.py | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/netbox_topology_views/forms.py b/netbox_topology_views/forms.py
index 144d041..744694e 100644
--- a/netbox_topology_views/forms.py
+++ b/netbox_topology_views/forms.py
@@ -66,7 +66,7 @@ class DeviceFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         initial=False
     )
     show_power = forms.BooleanField(
-        label=_("Show Power panel/feed"),
+        label=_("Show Power Feeds"),
         required=False,
         initial=False
     )
diff --git a/netbox_topology_views/views.py b/netbox_topology_views/views.py
index 9f55ddc..8e346ce 100644
--- a/netbox_topology_views/views.py
+++ b/netbox_topology_views/views.py
@@ -168,9 +168,9 @@ def get_topology_data(queryset, hide_unconnected, save_coords, show_circuit, sho
     ignore_cable_type = settings.PLUGINS_CONFIG["netbox_topology_views"]["ignore_cable_type"]
 
     device_ids = [d.id for d in queryset]
+    site_ids = [d.site.id for d in queryset]
 
     if show_circuit:
-        site_ids = [d.site.id for d in queryset]
         circuits = CircuitTermination.objects.filter( Q(site_id__in=site_ids) | Q( provider_network__isnull=False) ).prefetch_related("provider_network", "circuit")
         for circuit in circuits:
             if not hide_unconnected and circuit.circuit.id not in nodes_circuits:
@@ -222,16 +222,20 @@ def get_topology_data(queryset, hide_unconnected, save_coords, show_circuit, sho
                 if power_feed.power_panel.id not in nodes_powerpanel:
                     nodes_powerpanel[power_feed.power_panel.id] = power_feed.power_panel
 
+                    print(power_feed.link_peers[0].__dict__)
+
+                power_link_name = ""
                 if power_feed.id not in nodes_powerfeed:
                     if hide_unconnected:
                         if power_feed.link_peers[0].device.id in device_ids:
                             nodes_powerfeed[power_feed.id] = power_feed
+                            power_link_name =power_feed.link_peers[0].name
                     else:
                         nodes_powerfeed[power_feed.id] = power_feed
 
                 edge_ids += 1
-                termination_a = { "termination_name": power_feed.power_panel.name, "termination_device_name": str(power_feed.power_panel.id), "device_id": "p{}".format(power_feed.power_panel.id) }
-                termination_b = { "termination_name": power_feed.name, "termination_device_name": str(termination.id), "device_id": "f{}".format(power_feed.id) }
+                termination_a = { "termination_name": power_feed.power_panel.name, "termination_device_name": "", "device_id": "p{}".format(power_feed.power_panel.id) }
+                termination_b = { "termination_name": power_feed.name, "termination_device_name": power_link_name, "device_id": "f{}".format(power_feed.id) }
                 edges.append(create_edge(edge_id=edge_ids, termination_a=termination_a, termination_b=termination_b, power=True))
 
                 if power_feed.cable_id is not None: