Ticket #12004: 12004_admin_abstract_models.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_views/models.py

@@ -641 +641 @@
 class Topping(models.Model):
     name = models.CharField(max_length=20)
 
-class Pizza(models.Model):
+class AbstractPizza(models.Model):
     name = models.CharField(max_length=20)
+
+    class Meta:
+        abstract = True
+
+class Pizza(AbstractPizza):
     toppings = models.ManyToManyField('Topping')
 
 class PizzaAdmin(admin.ModelAdmin):

tests/regressiontests/admin_views/tests.py

@@ -6 +6 @@
 
 from django.conf import settings
 from django.core import mail
-from django.core.exceptions import SuspiciousOperation
+from django.core.exceptions import SuspiciousOperation, ImproperlyConfigured
 from django.core.files import temp as tempfile
 from django.core.urlresolvers import reverse
 # Register auth models with the admin.
@@ -36 +36 @@
     Language, Collector, Widget, Grommet, DooHickey, FancyDoodad, Whatsit,
     Category, Post, Plot, FunkyTag, Chapter, Book, Promo, WorkHour, Employee,
     Question, Answer, Inquisition, Actor, FoodDelivery,
-    RowLevelChangePermissionModel, Paper, CoverLetter)
+    RowLevelChangePermissionModel, Paper, CoverLetter, AbstractPizza)
 
 
 class AdminViewBasicTest(TestCase):
@@ -530 +530 @@
         response = self.client.get('/test_admin/%s/my_view/' % self.urlbit)
         self.assert_(response.content == "Django is a magical pony!", response.content)
 
+class AdminRegistrationTest(TestCase):
+
+    def testAbstractModel(self):
+        """
+        Exception is raised when trying to register an abstract model.
+        Refs #12004.
+        """
+        from django.contrib.admin import site
+        # Smoke test to determine whether admin site works at all
+        response = self.client.get('/test_admin/admin/admin_views/pizza/')
+        self.failUnlessEqual(response.status_code, 200)
+        self.assertRaises(ImproperlyConfigured, site.register, AbstractPizza)
+
 def get_perm(Model, perm):
     """Return the permission object, for the Model"""
     ct = ContentType.objects.get_for_model(Model)