Merge branch 'develop' into virtualization

2026-01-18 17:52:21 -06:00 · 2017-08-31 10:14:50 -04:00
parent 71069ced7f 372e9335b1
commit 0634386b2e
29 changed files with 311 additions and 173 deletions
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -83,7 +83,11 @@
                <tr>
                    <td>Role</td>
                    <td>
-                        <a href="{% url 'ipam:ipaddress_list' %}?role={{ ipaddress.role }}">{{ ipaddress.get_role_display }}</a>
+                        {% if ipaddress.role %}
+                            <a href="{% url 'ipam:ipaddress_list' %}?role={{ ipaddress.role }}">{{ ipaddress.get_role_display }}</a>
+                        {% else %}
+                            <span class="text-muted">None</span>
+                        {% endif %}
                    </td>
                </tr>
                <tr>