Jelajahi Sumber

Clean up prefix hierarchy annotation

Jeremy Stretch 5 tahun lalu
induk
melakukan
1e5778e6db
2 mengubah file dengan 13 tambahan dan 7 penghapusan
  1. 5 7
      netbox/ipam/tables.py
  2. 8 0
      netbox/utilities/templatetags/helpers.py

+ 5 - 7
netbox/ipam/tables.py

@@ -18,13 +18,11 @@ UTILIZATION_GRAPH = """
 """
 """
 
 
 PREFIX_LINK = """
 PREFIX_LINK = """
-{% if record.children %}
-    <span class="text-nowrap" style="padding-left: {{ record.parents }}0px "><i class="mdi mdi-chevron-right"></i></a>
-{% else %}
-    <span class="text-nowrap" style="padding-left: {{ record.parents }}9px">
-{% endif %}
-    <a href="{% if record.pk %}{% url 'ipam:prefix' pk=record.pk %}{% else %}{% url 'ipam:prefix_add' %}?prefix={{ record }}{% if parent.vrf %}&vrf={{ parent.vrf.pk }}{% endif %}{% if parent.site %}&site={{ parent.site.pk }}{% endif %}{% if parent.tenant %}&tenant_group={{ parent.tenant.group.pk }}&tenant={{ parent.tenant.pk }}{% endif %}{% endif %}">{{ record.prefix }}</a>
-</span>
+{% load helpers %}
+{% for i in record.parents|as_range %}
+    <i class="mdi mdi-circle-small"></i>
+{% endfor %}
+<a href="{% if record.pk %}{% url 'ipam:prefix' pk=record.pk %}{% else %}{% url 'ipam:prefix_add' %}?prefix={{ record }}{% if parent.vrf %}&vrf={{ parent.vrf.pk }}{% endif %}{% if parent.site %}&site={{ parent.site.pk }}{% endif %}{% if parent.tenant %}&tenant_group={{ parent.tenant.group.pk }}&tenant={{ parent.tenant.pk }}{% endif %}{% endif %}">{{ record.prefix }}</a>
 """
 """
 
 
 PREFIX_ROLE_LINK = """
 PREFIX_ROLE_LINK = """

+ 8 - 0
netbox/utilities/templatetags/helpers.py

@@ -208,6 +208,14 @@ def split(string, sep=','):
     return string.split(sep)
     return string.split(sep)
 
 
 
 
+@register.filter()
+def as_range(n):
+    """
+    Return a range of n items.
+    """
+    return range(n)
+
+
 #
 #
 # Tags
 # Tags
 #
 #