Fixes #381: Implements a new RackImportTable

netbox-community · Jul 25, 2016 · c466dc5 · c466dc5
1 parent b62cd32
commit c466dc5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
@@ -102,14 +102,25 @@ class RackTable(BaseTable):
     group = tables.Column(accessor=Accessor('group.name'), verbose_name='Group')
     facility_id = tables.Column(verbose_name='Facility ID')
     u_height = tables.Column(verbose_name='Height (U)')
+    devices = tables.Column(accessor=Accessor('device_count'), verbose_name='Devices')
     u_consumed = tables.Column(accessor=Accessor('u_consumed'), verbose_name='Used (U)')
     utilization = tables.TemplateColumn(UTILIZATION_GRAPH, orderable=False, verbose_name='Utilization')
-    devices = tables.Column(accessor=Accessor('device_count'), verbose_name='Devices')
 
     class Meta(BaseTable.Meta):
         model = Rack
-        fields = ('pk', 'name', 'site', 'group', 'facility_id', 'u_height', 'devices')
+        fields = ('pk', 'name', 'site', 'group', 'facility_id', 'u_height', 'devices', 'u_consumed', 'utilization')
+
 
+class RackImportTable(BaseTable):
+    name = tables.LinkColumn('dcim:rack', args=[Accessor('pk')], verbose_name='Name')
+    site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')], verbose_name='Site')
+    group = tables.Column(accessor=Accessor('group.name'), verbose_name='Group')
+    facility_id = tables.Column(verbose_name='Facility ID')
+    u_height = tables.Column(verbose_name='Height (U)')
+
+    class Meta(BaseTable.Meta):
+        model = Rack
+        fields = ('site', 'group', 'name', 'facility_id', 'u_height')
 
 #
 # Manufacturers

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
@@ -188,7 +188,7 @@ class RackDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 class RackBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_rack'
     form = forms.RackImportForm
-    table = tables.RackTable
+    table = tables.RackImportTable
     template_name = 'dcim/rack_import.html'
     obj_list_url = 'dcim:rack_list'