Ticket #14639: 14639-admin-site-prevent-abstract-registration.patch

django/contrib/admin/sites.py

@@ -78 +78 @@
             if model in self._registry:
                 raise AlreadyRegistered('The model %s is already registered' % model.__name__)
 
+            if model._meta.abstract:
+                raise ValueError("Cannot register %s because it is an abstract model")
+
             # If we got **options then dynamically construct a subclass of
             # admin_class with those **options.
             if options:

tests/regressiontests/admin_registration/models.py

@@ -9 +9 @@
 
 class Place(models.Model):
     name = models.CharField(max_length=200)
+
+class AbstractModel(models.Model):
+    name = models.CharField(max_length=200)
+    class Meta:
+        abstract = True
+
+class ConcreteModel(AbstractModel):
+    description = models.CharField(max_length=200)

tests/regressiontests/admin_registration/tests.py

@@ -2 +2 @@
 
 from django.contrib import admin
 
-from models import Person, Place
+from models import Person, Place, AbstractModel, ConcreteModel
 
 class NameAdmin(admin.ModelAdmin):
     list_display = ['name']
@@ -30 +30 @@
                           self.site.register,
                           Person)
 
+    def test_prevent_abstract_registration(self):
+        self.site.register(ConcreteModel)
+        self.assertRaises(ValueError,
+                          self.site.register,
+                          AbstractModel)
+
     def test_registration_with_star_star_options(self):
         self.site.register(Person, search_fields=['name'])
         self.assertEqual(self.site._registry[Person].search_fields, ['name'])