Răsfoiți Sursa

Merge pull request #8874 from minitriga/issue_8575

Closes: #8575 - Show Racks on Cable Table and Cable Page
Jeremy Stretch 3 ani în urmă
părinte
comite
32eed72d2b
2 a modificat fișierele cu 29 adăugiri și 1 ștergeri
  1. 13 1
      netbox/dcim/tables/cables.py
  2. 16 0
      netbox/templates/dcim/inc/cable_termination.html

+ 13 - 1
netbox/dcim/tables/cables.py

@@ -23,6 +23,12 @@ class CableTable(BaseTable):
         orderable=False,
         orderable=False,
         verbose_name='Side A'
         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(
     termination_a = tables.Column(
         accessor=Accessor('termination_a'),
         accessor=Accessor('termination_a'),
         orderable=False,
         orderable=False,
@@ -35,6 +41,12 @@ class CableTable(BaseTable):
         orderable=False,
         orderable=False,
         verbose_name='Side B'
         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(
     termination_b = tables.Column(
         accessor=Accessor('termination_b'),
         accessor=Accessor('termination_b'),
         orderable=False,
         orderable=False,
@@ -55,7 +67,7 @@ class CableTable(BaseTable):
     class Meta(BaseTable.Meta):
     class Meta(BaseTable.Meta):
         model = Cable
         model = Cable
         fields = (
         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',
             'status', 'type', 'tenant', 'color', 'length', 'tags', 'created', 'last_updated',
         )
         )
         default_columns = (
         default_columns = (

+ 16 - 0
netbox/templates/dcim/inc/cable_termination.html

@@ -8,6 +8,22 @@
                 <a href="{{ termination.device.get_absolute_url }}">{{ termination.device }}</a>
                 <a href="{{ termination.device.get_absolute_url }}">{{ termination.device }}</a>
             </td>
             </td>
         </tr>
         </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>
         <tr>
             <td>Type</td>
             <td>Type</td>
             <td>
             <td>