Remove MultiTableMixin models attribute - not allowing tests to work.…

… Add new test for MultiTableMixin.get_tables_classes
jieter · Dec 3, 2022 · 43323e8 · 43323e8
1 parent 42fe084
commit 43323e8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/django_tables2/views.py b/django_tables2/views.py
@@ -182,7 +182,6 @@ class MultiTableMixin(TableMixinBase):
     """
 
     tables = None
-    models = None
     tables_data = None
 
     table_prefix = "table_{}-"
@@ -194,19 +193,14 @@ def get_tables_classes(self):
         """
         Return the list of classes to use for the tables.
         """
-        if self.tables is None and self.models is None:
-            klass = type(self).__name__
-            raise ImproperlyConfigured("No tables were specified. Define {}.tables".format(klass))
-
-        if self.tables:
-            return self.tables
-
-        if self.models:
-            return [tables.table_factory(self.model) for model in self.models]
+        if self.tables is None:
+            raise ImproperlyConfigured(
+                "You must either specify {0}.tables or override {0}.get_tables_classes()".format(
+                    type(self).__name__
+                )
+            )
 
-        raise ImproperlyConfigured(
-            "You must either specify {0}.tables or {0}.models".format(type(self).__name__)
-        )
+        return self.tables
 
     def get_tables(self, **kwargs):
         """

diff --git a/tests/test_views.py b/tests/test_views.py
@@ -388,7 +388,20 @@ def test_with_empty_get_tables_list(self):
         class View(tables.MultiTableMixin, TemplateView):
             template_name = "multiple.html"
 
-            def get_tables(self):
+            def get_tables(self, **kwargs):
+                return []
+
+        response = View.as_view()(build_request("/"))
+        response.render()
+
+        html = response.rendered_content
+        self.assertIn("<h1>Multiple tables using MultiTableMixin</h1>", html)
+
+    def test_with_empty_get_tables_clases_list(self):
+        class View(tables.MultiTableMixin, TemplateView):
+            template_name = "multiple.html"
+
+            def get_tables_classes(self):
                 return []
 
         response = View.as_view()(build_request("/"))