From 04fd197c9b752b7f0c3efef48e6c0f51e24714f6 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 26 Dec 2016 14:30:56 -0500
Subject: [PATCH] Fixed table form rendering for django-tables2>=1.2.1

---
 netbox/templates/utilities/obj_table.html | 2 +-
 netbox/utilities/tables.py                | 4 ++++
 netbox/utilities/views.py                 | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/netbox/templates/utilities/obj_table.html b/netbox/templates/utilities/obj_table.html
index 4f4b27db7..4aa823f26 100644
--- a/netbox/templates/utilities/obj_table.html
+++ b/netbox/templates/utilities/obj_table.html
@@ -4,7 +4,7 @@
     <form method="post" class="form form-horizontal">
         {% csrf_token %}
         <input type="hidden" name="redirect_url" value="{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" />
-        <input type="hidden" name="pk_all" value="{% for row in table.rows %}{{ row.record.pk|default:'' }}{% if not forloop.last %},{% endif %}{% endfor %}" />
+        <input type="hidden" name="pk_all" value="{% for obj in table.data.queryset %}{{ obj.pk|default:'' }}{% if not forloop.last %},{% endif %}{% endfor %}" />
         {% if table.paginator.num_pages > 1 %}
             <div id="select_all_box" class="hidden alert alert-info">
                 <div class="checkbox-inline">
diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py
index a53227937..9111bd976 100644
--- a/netbox/utilities/tables.py
+++ b/netbox/utilities/tables.py
@@ -17,6 +17,10 @@ class BaseTable(tables.Table):
             'class': 'table table-hover',
         }
 
+    @property
+    def model(self):
+        return self._meta.model
+
 
 class ToggleColumn(tables.CheckBoxColumn):
 
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index ee625076d..bca4c1771 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -92,7 +92,6 @@ class ObjectListView(View):
 
         # Construct the table based on the user's permissions
         table = self.table(self.queryset)
-        table.model = model
         if 'pk' in table.base_columns and any([request.user.has_perm(perm) for perm in self.edit_permissions]):
             table.base_columns['pk'].visible = True
         RequestConfig(request, paginate={'klass': EnhancedPaginator}).configure(table)