Ticket #12004: 12004_admin_abstract_models.2.diff

django/contrib/admin/sites.py

@@ -61 +61 @@
         they'll be applied as options to the admin class.
 
         If a model is already registered, this will raise AlreadyRegistered.
+        
+        If a model is abstract, this will raise ImproperlyConfigured.
         """
         if not admin_class:
             admin_class = ModelAdmin
@@ -74 +76 @@
         if isinstance(model_or_iterable, ModelBase):
             model_or_iterable = [model_or_iterable]
         for model in model_or_iterable:
+            if model._meta.abstract:
+                raise ImproperlyConfigured('The model %s is abstract and '
+                      'therefore cannot be registered' % model.__name__)
+
             if model in self._registry:
                 raise AlreadyRegistered('The model %s is already registered' % model.__name__)
 

tests/regressiontests/admin_registration/models.py

@@ -7 +7 @@
 class Person(models.Model):
     name = models.CharField(max_length=200)
 
-class Place(models.Model):
+class Location(models.Model):
+    class Meta:
+        abstract = True
+    
+class Place(Location):
     name = models.CharField(max_length=200)

tests/regressiontests/admin_registration/tests.py

@@ -1 +1 @@
 from django.test import TestCase
-
+from django.core.exceptions import ImproperlyConfigured
 from django.contrib import admin
 
-from models import Person, Place
+from models import Person, Place, Location
 
 class NameAdmin(admin.ModelAdmin):
     list_display = ['name']
@@ -52 +52 @@
             isinstance(self.site._registry[Place], admin.options.ModelAdmin)
         )
         self.assertEqual(self.site._registry[Place].search_fields, ['name'])
+
+    def test_abstract_model(self):
+        """
+        Exception is raised when trying to register an abstract model.
+        Refs #12004.
+        """
+        self.assertRaises(ImproperlyConfigured, self.site.register, Location)