Browse Source

Changed VRF and VLAN views to use PrefixBriefTable

Jeremy Stretch 8 years ago
parent
commit
75c3e62ca8
4 changed files with 7 additions and 42 deletions
  1. 1 0
      netbox/ipam/tables.py
  2. 4 2
      netbox/ipam/views.py
  3. 1 20
      netbox/templates/ipam/vlan.html
  4. 1 20
      netbox/templates/ipam/vrf.html

+ 1 - 0
netbox/ipam/tables.py

@@ -159,6 +159,7 @@ class PrefixBriefTable(BaseTable):
     class Meta(BaseTable.Meta):
         model = Prefix
         fields = ('prefix', 'status', 'site', 'role')
+        orderable = False
 
 
 #

+ 4 - 2
netbox/ipam/views.py

@@ -48,10 +48,11 @@ def vrf(request, pk):
 
     vrf = get_object_or_404(VRF.objects.all(), pk=pk)
     prefixes = Prefix.objects.filter(vrf=vrf)
+    prefix_table = tables.PrefixBriefTable(prefixes)
 
     return render(request, 'ipam/vrf.html', {
         'vrf': vrf,
-        'prefixes': prefixes,
+        'prefix_table': prefix_table,
     })
 
 
@@ -528,10 +529,11 @@ def vlan(request, pk):
 
     vlan = get_object_or_404(VLAN.objects.select_related('site', 'role'), pk=pk)
     prefixes = Prefix.objects.filter(vlan=vlan)
+    prefix_table = tables.PrefixBriefTable(prefixes)
 
     return render(request, 'ipam/vlan.html', {
         'vlan': vlan,
-        'prefixes': prefixes,
+        'prefix_table': prefix_table,
     })
 
 

+ 1 - 20
netbox/templates/ipam/vlan.html

@@ -118,26 +118,7 @@
             <div class="panel-heading">
                 <strong>Prefixes</strong>
             </div>
-            {% if prefixes %}
-                <table class="table table-hover panel-body">
-                    {% for p in prefixes %}
-                        <tr>
-                            <td>
-                                <a href="{% url 'ipam:prefix' pk=p.pk %}">{{ p }}</a>
-                            </td>
-                            <td>
-                                {% if p.site %}
-                                    <a href="{% url 'dcim:site' slug=p.site.slug %}">{{ p.site }}</a>
-                                {% endif %}
-                            </td>
-                            <td>{{ p.get_status_display }}</td>
-                            <td>{{ p.role }}</td>
-                        </tr>
-                    {% endfor %}
-                </table>
-            {% else %}
-                <div class="panel-body text-muted">None</div>
-            {% endif %}
+            {% render_table prefix_table %}
         </div>
 	</div>
 </div>

+ 1 - 20
netbox/templates/ipam/vrf.html

@@ -96,26 +96,7 @@
             <div class="panel-heading">
                 <strong>Prefixes</strong>
             </div>
-            {% if prefixes %}
-                <table class="table table-hover panel-body">
-                    {% for p in prefixes %}
-                        <tr>
-                            <td>
-                                <a href="{% url 'ipam:prefix' pk=p.pk %}">{{ p }}</a>
-                            </td>
-                            <td>
-                                {% if p.site %}
-                                    <a href="{% url 'dcim:site' slug=p.site.slug %}">{{ p.site }}</a>
-                                {% endif %}
-                            </td>
-                            <td>{{ p.status }}</td>
-                            <td>{{ p.role }}</td>
-                        </tr>
-                    {% endfor %}
-                </table>
-            {% else %}
-                <div class="panel-body text-muted">None</div>
-            {% endif %}
+            {% render_table prefix_table %}
         </div>
 	</div>
 </div>