From ae42e163fa21f94b45da6cda8802fb9a8e0c6836 Mon Sep 17 00:00:00 2001 From: Nick Peelman Date: Tue, 5 Jul 2016 14:59:29 -0400 Subject: [PATCH 1/3] Fixing a nesting/logic issue on device type edit/delete buttons --- netbox/templates/dcim/devicetype.html | 28 +++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 4510e6e43..446658f8a 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -14,23 +14,27 @@ -{% if perms.dcim.change_devicetype %} + +{% if perms.dcim.change_devicetype or perms.dcim.delete_devicetype %}
- - - Edit this device type - - {% endif %} - {% if perms.dcim.delete_devicetype %} - - - Delete this device type - + {% if perms.dcim.change_devicetype %} + + + Edit this device type + + {% endif %} + {% if perms.dcim.delete_devicetype %} + + + Delete this device type + + {% endif %}
{% endif %} +

{{ devicetype }}

-
+
Chassis From 0135d945b55b4aef3628074430d140ffc31a6413 Mon Sep 17 00:00:00 2001 From: Nick Peelman Date: Tue, 5 Jul 2016 15:00:25 -0400 Subject: [PATCH 2/3] make device type network/console/power tables show based on device type settings --- netbox/templates/dcim/devicetype.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 446658f8a..c3998e8cd 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -80,10 +80,16 @@ {% 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=interface_table title='Interfaces' add_url='dcim:devicetype_add_interface' delete_url='dcim:devicetype_delete_interface' %} - {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' add_url='dcim:devicetype_add_consoleserverport' delete_url='dcim:devicetype_delete_consoleserverport' %} - {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' add_url='dcim:devicetype_add_poweroutlet' delete_url='dcim:devicetype_delete_poweroutlet' %} +
+ {% if devicetype.is_network_device %} + {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' add_url='dcim:devicetype_add_interface' delete_url='dcim:devicetype_delete_interface' %} + {% endif %} + {% if devicetype.is_console_server %} + {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' add_url='dcim:devicetype_add_consoleserverport' delete_url='dcim:devicetype_delete_consoleserverport' %} + {% endif %} + {% if devicetype.is_pdu %} + {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' add_url='dcim:devicetype_add_poweroutlet' delete_url='dcim:devicetype_delete_poweroutlet' %} + {% endif %}
{% endblock %} From d4512a45fb8eabb2cc5a8ff041ea532af185e702 Mon Sep 17 00:00:00 2001 From: Nick Peelman Date: Tue, 5 Jul 2016 15:14:03 -0400 Subject: [PATCH 3/3] Fixing dumb indent mistake... --- netbox/templates/dcim/devicetype.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index c3998e8cd..6f8f2311a 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -34,7 +34,7 @@

{{ devicetype }}

-
+
Chassis