Ticket #12004: fix12004.patch

django/contrib/admin/sites.py

@@ -74 +74 @@
         if isinstance(model_or_iterable, ModelBase):
             model_or_iterable = [model_or_iterable]
         for model in model_or_iterable:
+            if model._meta.abstract:
+                raise ImproperlyConfigured('Unable to register abstract model %s' % model.__name__)
+
             if model in self._registry:
                 raise AlreadyRegistered('The model %s is already registered' % model.__name__)
 

new file tests/regressiontests/admin_views/abstractadmin.py

@@ +1 @@
+"""
+see tests.AbstractAdminTest
+"""
+from django.contrib import admin
+
+import models
+
+site = admin.AdminSite(name="abstractadmin")
+
+site.register(models.Pizza)
+
+def do_register():
+    # This method should raise an ImproperlyConfigured exception
+    site.register(models.AbstractPizza)

tests/regressiontests/admin_views/models.py

@@ -573 +573 @@
 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

@@ -3 +3 @@
 import re
 import datetime
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
 from django.core.files import temp as tempfile
 from django.contrib.auth import admin # Register auth models with the admin.
 from django.contrib.auth.models import User, Permission, UNUSABLE_PASSWORD
@@ -24 +25 @@
     FooAccount, Gallery, ModelWithStringPrimaryKey, \
     Person, Persona, Picture, Podcast, Section, Subscriber, Vodcast, \
     Language, Collector, Widget, Grommet, DooHickey, FancyDoodad, Whatsit, \
-    Category, Post, Plot, FunkyTag
+    Category, Post, Plot, FunkyTag, AbstractPizza
 
 
 class AdminViewBasicTest(TestCase):
@@ -360 +361 @@
         response = self.client.get('/test_admin/%s/my_view/' % self.urlbit)
         self.assert_(response.content == "Django is a magical pony!", response.content)
 
+class AbstractAdminTest(TestCase):
+    fixtures = ['admin-views-users.xml']
+
+    urlbit = "abstractadmin"
+
+    def setUp(self):
+        self.old_language_code = settings.LANGUAGE_CODE
+        self.client.login(username='super', password='secret')
+
+    def tearDown(self):
+        settings.LANGUAGE_CODE = self.old_language_code
+        self.client.logout()
+
+    def test_abstract_register(self):
+        """
+        Regression test for #12004:
+        Exception is raised when trying to register an abstract model
+        """
+
+        import abstractadmin
+
+        # Smoke test to determine whether admin site works at all
+        response = self.client.get('/test_admin/abstractadmin/admin_views/pizza/')
+        self.failUnlessEqual(response.status_code, 200)
+
+        self.assertRaises(ImproperlyConfigured, abstractadmin.do_register)
+
 def get_perm(Model, perm):
     """Return the permission object, for the Model"""
     ct = ContentType.objects.get_for_model(Model)

tests/regressiontests/admin_views/urls.py

@@ -2 +2 @@
 from django.contrib import admin
 import views
 import customadmin
+import abstractadmin
 
 urlpatterns = patterns('',
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/secure-view/$', views.secure_view),
     (r'^admin/', include(admin.site.urls)),
     (r'^admin2/', include(customadmin.site.urls)),
+    (r'^abstractadmin/', include(abstractadmin.site.urls)),
 )