From b05171b126cbbb9c086ca2d4f22c732cb27bd3aa Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 2 Nov 2018 14:27:17 -0400
Subject: [PATCH] Upgraded django-tables2 to v2.0.2

---
 netbox/dcim/tables.py     |  7 +------
 netbox/ipam/views.py      | 10 +++++-----
 netbox/utilities/views.py |  3 +--
 requirements.txt          |  2 +-
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index d46a32f01..72bf30c14 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -623,11 +623,6 @@ class CableTable(BaseTable):
         args=[Accessor('pk')],
         verbose_name='ID'
     )
-    # django-tables2 adds CSS `class="label"` which causes rendering issues
-    label_ = tables.Column(
-        accessor=Accessor('label'),
-        verbose_name='Label'
-    )
     termination_a_parent = tables.TemplateColumn(
         template_code=CABLE_TERMINATION_PARENT,
         accessor=Accessor('termination_a'),
@@ -659,7 +654,7 @@ class CableTable(BaseTable):
     class Meta(BaseTable.Meta):
         model = Cable
         fields = (
-            'pk', 'id', 'label_', 'termination_a_parent', 'termination_a', 'termination_b_parent', 'termination_b',
+            'pk', 'id', 'label', 'termination_a_parent', 'termination_a', 'termination_b_parent', 'termination_b',
             'status', 'type', 'color', 'length',
         )
 
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index d96fc3074..1e3f14f8c 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -336,7 +336,7 @@ class AggregateView(View):
             prefix_table.columns.show('pk')
 
         paginate = {
-            'klass': EnhancedPaginator,
+            'paginator_class': EnhancedPaginator,
             'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT)
         }
         RequestConfig(request, paginate).configure(prefix_table)
@@ -512,7 +512,7 @@ class PrefixPrefixesView(View):
             prefix_table.columns.show('pk')
 
         paginate = {
-            'klass': EnhancedPaginator,
+            'paginator_class': EnhancedPaginator,
             'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT)
         }
         RequestConfig(request, paginate).configure(prefix_table)
@@ -551,7 +551,7 @@ class PrefixIPAddressesView(View):
             ip_table.columns.show('pk')
 
         paginate = {
-            'klass': EnhancedPaginator,
+            'paginator_class': EnhancedPaginator,
             'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT)
         }
         RequestConfig(request, paginate).configure(ip_table)
@@ -840,7 +840,7 @@ class VLANGroupVLANsView(View):
         vlan_table.columns.hide('group')
 
         paginate = {
-            'klass': EnhancedPaginator,
+            'paginator_class': EnhancedPaginator,
             'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT)
         }
         RequestConfig(request, paginate).configure(vlan_table)
@@ -899,7 +899,7 @@ class VLANMembersView(View):
         members_table = tables.VLANMemberTable(members)
 
         paginate = {
-            'klass': EnhancedPaginator,
+            'paginator_class': EnhancedPaginator,
             'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT)
         }
         RequestConfig(request, paginate).configure(members_table)
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 0e36f3220..e5751acb3 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -25,7 +25,6 @@ from django_tables2 import RequestConfig
 from extras.models import CustomField, CustomFieldValue, ExportTemplate
 from utilities.utils import queryset_to_csv
 from utilities.forms import BootstrapMixin, CSVDataField
-from .constants import M2M_FIELD_TYPES
 from .error_handlers import handle_protectederror
 from .forms import ConfirmationForm
 from .paginator import EnhancedPaginator
@@ -138,7 +137,7 @@ class ObjectListView(View):
 
         # Apply the request context
         paginate = {
-            'klass': EnhancedPaginator,
+            'paginator_class': EnhancedPaginator,
             'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT)
         }
         RequestConfig(request, paginate).configure(table)
diff --git a/requirements.txt b/requirements.txt
index cea9e1f96..f49d5dc49 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ django-cors-headers==2.4.0
 django-debug-toolbar==1.10.1
 django-filter==2.0.0
 django-mptt==0.9.1
-django-tables2==1.21.2
+django-tables2==2.0.2
 django-taggit==0.23.0
 django-taggit-serializer==0.1.7
 django-timezone-field==3.0