From 3cedfc3c6aaa030a784ffe4dc0169451723a9925 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 1 Jun 2016 13:37:03 -0400
Subject: [PATCH] Bulk edit list cleanup

---
 netbox/templates/circuits/circuit_bulk_edit.html  | 1 -
 netbox/templates/circuits/provider_bulk_edit.html | 5 ++---
 netbox/templates/dcim/devicetype_bulk_edit.html   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/netbox/templates/circuits/circuit_bulk_edit.html b/netbox/templates/circuits/circuit_bulk_edit.html
index d37fe5dfb..4668f36d2 100644
--- a/netbox/templates/circuits/circuit_bulk_edit.html
+++ b/netbox/templates/circuits/circuit_bulk_edit.html
@@ -11,7 +11,6 @@
             <td>{{ circuit.provider }}</td>
             <td>{{ circuit.port_speed }}</td>
             <td>{{ circuit.commit_rate }}</td>
-            <td>{{ circuit.comments }}</td>
         </tr>
     {% endfor %}
 {% endblock %}
diff --git a/netbox/templates/circuits/provider_bulk_edit.html b/netbox/templates/circuits/provider_bulk_edit.html
index a318847ae..af92861b0 100644
--- a/netbox/templates/circuits/provider_bulk_edit.html
+++ b/netbox/templates/circuits/provider_bulk_edit.html
@@ -7,9 +7,8 @@
     {% for provider in selected_objects %}
         <tr>
             <td><a href="{% url 'circuits:provider' slug=provider.slug %}">{{ provider }}</a></td>
-            <td>{{ aggregate.asn }}</td>
-            <td>{{ aggregate.account }}</td>
-            <td>{{ aggregate.comments }}</td>
+            <td>{{ provider.account }}</td>
+            <td>{{ provider.asn }}</td>
         </tr>
     {% endfor %}
 {% endblock %}
diff --git a/netbox/templates/dcim/devicetype_bulk_edit.html b/netbox/templates/dcim/devicetype_bulk_edit.html
index e2b6c6ef5..22911e9f0 100644
--- a/netbox/templates/dcim/devicetype_bulk_edit.html
+++ b/netbox/templates/dcim/devicetype_bulk_edit.html
@@ -9,7 +9,7 @@
             <td><a href="{% url 'dcim:devicetype' pk=devicetype.pk %}">{{ devicetype }}</a></td>
             <td>{{ devicetype.model }}</td>
             <td>{{ devicetype.manufacturer }}</td>
-            <td>{{ device.u_height }}</td>
+            <td>{{ devicetype.u_height }}U</td>
         </tr>
     {% endfor %}
 {% endblock %}