Răsfoiți Sursa

Closes #2809: Remove VRF child prefixes table; link to main prefixes view

Jeremy Stretch 7 ani în urmă
părinte
comite
ae0c8deec2
3 a modificat fișierele cu 14 adăugiri și 13 ștergeri
  1. 4 0
      CHANGELOG.md
  2. 2 5
      netbox/ipam/views.py
  3. 8 8
      netbox/templates/ipam/vrf.html

+ 4 - 0
CHANGELOG.md

@@ -1,5 +1,9 @@
 v2.5.5 (FUTURE)
 
+## Enhancements
+
+* [#2809](https://github.com/digitalocean/netbox/issues/2809) - Remove VRF child prefixes table; link to main prefixes view
+
 ## Bug Fixes
 
 * [#2824](https://github.com/digitalocean/netbox/issues/2824) - Fix template exception when viewing rack elevations list

+ 2 - 5
netbox/ipam/views.py

@@ -126,14 +126,11 @@ class VRFView(View):
     def get(self, request, pk):
 
         vrf = get_object_or_404(VRF.objects.all(), pk=pk)
-        prefix_table = tables.PrefixTable(
-            list(Prefix.objects.filter(vrf=vrf).select_related('site', 'role')), orderable=False
-        )
-        prefix_table.exclude = ('vrf',)
+        prefix_count = Prefix.objects.filter(vrf=vrf).count()
 
         return render(request, 'ipam/vrf.html', {
             'vrf': vrf,
-            'prefix_table': prefix_table,
+            'prefix_count': prefix_count,
         })
 
 

+ 8 - 8
netbox/templates/ipam/vrf.html

@@ -83,19 +83,19 @@
                 <tr>
                     <td>Description</td>
                     <td>{{ vrf.description|placeholder }}</td>
+                </tr>
+                <tr>
+                    <td>Prefixes</td>
+                    <td>
+                        <a href="{% url 'ipam:prefix_list' %}?vrf={{ vrf.rd }}">{{ prefix_count }}</a>
+                    </td>
                 </tr>
 		    </table>
         </div>
-        {% include 'inc/custom_fields_panel.html' with obj=vrf %}
         {% include 'extras/inc/tags_panel.html' with tags=vrf.tags.all url='ipam:vrf_list' %}
 	</div>
 	<div class="col-md-6">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Prefixes</strong>
-            </div>
-            {% include 'responsive_table.html' with table=prefix_table %}
-        </div>
-	</div>
+        {% include 'inc/custom_fields_panel.html' with obj=vrf %}
+    </div>
 </div>
 {% endblock %}