Merge branch 'develop' into develop-2.9

This commit is contained in:
Jeremy Stretch
2020-07-23 14:35:34 -04:00
4 changed files with 12 additions and 5 deletions

View File

@@ -111,8 +111,6 @@
{% include 'dcim/inc/device_napalm_tabs.html' with disabled_message='No platform assigned to this device' %}
{% elif not device.platform.napalm_driver %}
{% include 'dcim/inc/device_napalm_tabs.html' with disabled_message='No NAPALM driver assigned for this platform' %}
{% elif not device.primary_ip %}
{% include 'dcim/inc/device_napalm_tabs.html' with disabled_message='No primary IP address assigned to this device' %}
{% else %}
{% include 'dcim/inc/device_napalm_tabs.html' %}
{% endif %}