Browse Source

Fixes #290: Added mgmt interfaces table to device type view

Jeremy Stretch 8 years ago
parent
commit
a5f6e64849
2 changed files with 7 additions and 1 deletions
  1. 6 1
      netbox/dcim/views.py
  2. 1 0
      netbox/templates/dcim/devicetype.html

+ 6 - 1
netbox/dcim/views.py

@@ -273,7 +273,10 @@ def devicetype(request, pk):
     poweroutlet_table = tables.PowerOutletTemplateTable(
     poweroutlet_table = tables.PowerOutletTemplateTable(
         natsorted(PowerOutletTemplate.objects.filter(device_type=devicetype), key=attrgetter('name'))
         natsorted(PowerOutletTemplate.objects.filter(device_type=devicetype), key=attrgetter('name'))
     )
     )
-    interface_table = tables.InterfaceTemplateTable(InterfaceTemplate.objects.filter(device_type=devicetype))
+    mgmt_interface_table = tables.InterfaceTemplateTable(InterfaceTemplate.objects.filter(device_type=devicetype,
+                                                                                          mgmt_only=True))
+    interface_table = tables.InterfaceTemplateTable(InterfaceTemplate.objects.filter(device_type=devicetype,
+                                                                                     mgmt_only=False))
     devicebay_table = tables.DeviceBayTemplateTable(
     devicebay_table = tables.DeviceBayTemplateTable(
         natsorted(DeviceBayTemplate.objects.filter(device_type=devicetype), key=attrgetter('name'))
         natsorted(DeviceBayTemplate.objects.filter(device_type=devicetype), key=attrgetter('name'))
     )
     )
@@ -282,6 +285,7 @@ def devicetype(request, pk):
         consoleserverport_table.base_columns['pk'].visible = True
         consoleserverport_table.base_columns['pk'].visible = True
         powerport_table.base_columns['pk'].visible = True
         powerport_table.base_columns['pk'].visible = True
         poweroutlet_table.base_columns['pk'].visible = True
         poweroutlet_table.base_columns['pk'].visible = True
+        mgmt_interface_table.base_columns['pk'].visible = True
         interface_table.base_columns['pk'].visible = True
         interface_table.base_columns['pk'].visible = True
         devicebay_table.base_columns['pk'].visible = True
         devicebay_table.base_columns['pk'].visible = True
 
 
@@ -291,6 +295,7 @@ def devicetype(request, pk):
         'consoleserverport_table': consoleserverport_table,
         'consoleserverport_table': consoleserverport_table,
         'powerport_table': powerport_table,
         'powerport_table': powerport_table,
         'poweroutlet_table': poweroutlet_table,
         'poweroutlet_table': poweroutlet_table,
+        'mgmt_interface_table': mgmt_interface_table,
         'interface_table': interface_table,
         'interface_table': interface_table,
         'devicebay_table': devicebay_table,
         'devicebay_table': devicebay_table,
     })
     })

+ 1 - 0
netbox/templates/dcim/devicetype.html

@@ -79,6 +79,7 @@
         </div>
         </div>
         {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' add_url='dcim:devicetype_add_consoleport' delete_url='dcim:devicetype_delete_consoleport' %}
         {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' add_url='dcim:devicetype_add_consoleport' delete_url='dcim:devicetype_delete_consoleport' %}
         {% include 'dcim/inc/devicetype_component_table.html' with table=powerport_table title='Power Ports' add_url='dcim:devicetype_add_powerport' delete_url='dcim:devicetype_delete_powerport' %}
         {% include 'dcim/inc/devicetype_component_table.html' with table=powerport_table title='Power Ports' add_url='dcim:devicetype_add_powerport' delete_url='dcim:devicetype_delete_powerport' %}
+        {% include 'dcim/inc/devicetype_component_table.html' with table=mgmt_interface_table title='Management Interfaces' add_url='dcim:devicetype_add_interface' delete_url='dcim:devicetype_delete_interface' %}
     </div>
     </div>
     <div class="col-md-6">
     <div class="col-md-6">
         {% if devicetype.is_parent_device %}
         {% if devicetype.is_parent_device %}