From c466dc59996ee01a810b6b31a05f2760c4de4f24 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 25 Jul 2016 12:04:42 -0400 Subject: [PATCH] Fixes #381: Implements a new RackImportTable --- netbox/dcim/tables.py | 15 +++++++++++++-- netbox/dcim/views.py | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index dfe2544fe..a36c245cd 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -102,15 +102,26 @@ 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 index 5f8434bcc..390479895 100644 --- 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'