From a143eca57d756a5b2786f96fd6ec09c3d2ff272b Mon Sep 17 00:00:00 2001
From: Alex Gittings <alexgit@hotmail.co.uk>
Date: Tue, 15 Mar 2022 00:02:16 +0000
Subject: [PATCH 1/3] Closes: #8575 Implement rack_a and rack_b for cable table

---
 netbox/dcim/tables/cables.py                   | 16 ++++++++++++++--
 .../templates/dcim/inc/cable_termination.html  | 18 +++++++++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/netbox/dcim/tables/cables.py b/netbox/dcim/tables/cables.py
index 9f2c08342..ebd0b8ebc 100644
--- a/netbox/dcim/tables/cables.py
+++ b/netbox/dcim/tables/cables.py
@@ -23,6 +23,12 @@ class CableTable(BaseTable):
         orderable=False,
         verbose_name='Side A'
     )
+    rack_a = tables.Column(
+        accessor=Accessor('termination_a__device__rack'),
+        orderable=False,
+        linkify=True,
+        verbose_name='Rack A'
+    )
     termination_a = tables.Column(
         accessor=Accessor('termination_a'),
         orderable=False,
@@ -35,6 +41,12 @@ class CableTable(BaseTable):
         orderable=False,
         verbose_name='Side B'
     )
+    rack_b = tables.Column(
+        accessor=Accessor('termination_b__device__rack'),
+        orderable=False,
+        linkify=True,
+        verbose_name='Rack B'
+    )
     termination_b = tables.Column(
         accessor=Accessor('termination_b'),
         orderable=False,
@@ -55,10 +67,10 @@ class CableTable(BaseTable):
     class Meta(BaseTable.Meta):
         model = Cable
         fields = (
-            'pk', 'id', 'label', 'termination_a_parent', 'termination_a', 'termination_b_parent', 'termination_b',
+            'pk', 'id', 'label', 'termination_a_parent', 'rack_a', 'termination_a', 'termination_b_parent', 'rack_b', 'termination_b',
             'status', 'type', 'tenant', 'color', 'length', 'tags', 'created', 'last_updated',
         )
         default_columns = (
             'pk', 'id', 'label', 'termination_a_parent', 'termination_a', 'termination_b_parent', 'termination_b',
             'status', 'type',
-        )
+        )
\ No newline at end of file
diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html
index 1ba3d05c9..967d733de 100644
--- a/netbox/templates/dcim/inc/cable_termination.html
+++ b/netbox/templates/dcim/inc/cable_termination.html
@@ -8,6 +8,22 @@
                 <a href="{{ termination.device.get_absolute_url }}">{{ termination.device }}</a>
             </td>
         </tr>
+        {% if termination.device.site %}
+        <tr>
+            <td>Site</td>
+            <td>
+                <a href="{{ termination.device.site.get_absolute_url }}">{{ termination.device.site }}</a>
+            </td>
+        </tr>
+        {% endif %}
+        {% if termination.device.rack %}
+        <tr>
+            <td>Rack</td>
+            <td>
+                <a href="{{ termination.device.rack.get_absolute_url }}">{{ termination.device.rack }}</a>
+            </td>
+        </tr>
+        {% endif %}
         <tr>
             <td>Type</td>
             <td>
@@ -35,4 +51,4 @@
             </td>
         </tr>
     {% endif %}
-</table>
+</table>
\ No newline at end of file

From bdbfff911bfbe85caf2c4c7509b63f847a82dd2c Mon Sep 17 00:00:00 2001
From: Alex Gittings <alexgit@hotmail.co.uk>
Date: Tue, 15 Mar 2022 00:04:22 +0000
Subject: [PATCH 2/3] add new line

---
 netbox/templates/dcim/inc/cable_termination.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html
index 967d733de..c9f3f0d4a 100644
--- a/netbox/templates/dcim/inc/cable_termination.html
+++ b/netbox/templates/dcim/inc/cable_termination.html
@@ -51,4 +51,4 @@
             </td>
         </tr>
     {% endif %}
-</table>
\ No newline at end of file
+</table>

From 9548cf32ffc370af2bc6b65af0ae470fb31960b3 Mon Sep 17 00:00:00 2001
From: Alex Gittings <alexgit@hotmail.co.uk>
Date: Tue, 15 Mar 2022 00:05:10 +0000
Subject: [PATCH 3/3] add new line

---
 netbox/dcim/tables/cables.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/dcim/tables/cables.py b/netbox/dcim/tables/cables.py
index ebd0b8ebc..97b54bf41 100644
--- a/netbox/dcim/tables/cables.py
+++ b/netbox/dcim/tables/cables.py
@@ -73,4 +73,4 @@ class CableTable(BaseTable):
         default_columns = (
             'pk', 'id', 'label', 'termination_a_parent', 'termination_a', 'termination_b_parent', 'termination_b',
             'status', 'type',
-        )
\ No newline at end of file
+        )