Просмотр исходного кода

Fixes #8196: Fix IndexError exception when viewing large IPv6 prefixes in UI

jeremystretch 4 лет назад
Родитель
Сommit
e18dc43aae
2 измененных файлов с 13 добавлено и 2 удалено
  1. 2 1
      docs/release-notes/version-3.1.md
  2. 11 1
      netbox/templates/ipam/prefix.html

+ 2 - 1
docs/release-notes/version-3.1.md

@@ -9,8 +9,9 @@
 
 ### Bug Fixes
 
-* [#8191](https://github.com/netbox-community/netbox/issues/8191) - Fix return URL when adding IP addresses to VM interfaces
 * [#8187](https://github.com/netbox-community/netbox/issues/8187) - Fix rendering of tags column in object tables
+* [#8191](https://github.com/netbox-community/netbox/issues/8191) - Fix return URL when adding IP addresses to VM interfaces
+* [#8196](https://github.com/netbox-community/netbox/issues/8196) - Fix IndexError exception when viewing large IPv6 prefixes in UI
 
 ---
 

+ 11 - 1
netbox/templates/ipam/prefix.html

@@ -1,4 +1,5 @@
 {% extends 'ipam/prefix/base.html' %}
+{% load humanize %}
 {% load helpers %}
 {% load plugins %}
 
@@ -124,9 +125,18 @@
                 <a href="{% url 'ipam:prefix_ipaddresses' pk=object.pk %}">{{ child_ip_count }}</a>
               </td>
             </tr>
+          {% endwith %}
+          {% with available_count=object.get_available_ips.size %}
             <tr>
               <th scope="row">Available IPs</th>
-              <td>{{ object.get_available_ips|length }}</td>
+              <td>
+                {# Use human-friendly words for counts greater than one million #}
+                {% if available_count > 1000000 %}
+                  {{ available_count|intword }}
+                {% else %}
+                  {{ available_count|intcomma }}
+                {% endif %}
+              </td>
             </tr>
           {% endwith %}
           <tr>