Ticket #9749: patch_django_9749.20090507.diff

django/contrib/admin/validation.py

@@ -8 +8 @@
-from django.forms.models import BaseModelForm, BaseModelFormSet, fields_for_model, _get_foreign_key
-from django.contrib.admin.options import flatten_fieldsets, BaseModelAdmin
-from django.contrib.admin.options import HORIZONTAL, VERTICAL
+from django.contrib.admin.views.main import ChangeList
-
-__all__ = ['validate']
-
@@ -148 +149 @@
-            validate_base(inline, inline.model)
-            validate_inline(inline, cls, model)
-
+    # changelist_class = ChangeList
+    if hasattr(cls, 'changelist_class') and not issubclass(cls.changelist_class, ChangeList):
+        raise ImproperlyConfigured("'%s.changelist_class' does not inherit "
+                        "from admin.views.main.ChangeList." % cls.__name__)
+
-def validate_inline(cls, parent, parent_model):
-    # model is already verified to exist and be a Model
-    if cls.fk_name: # default value is None

django/contrib/admin/options.py

@@ -174 +174 @@
-
-class ModelAdmin(BaseModelAdmin):
-    "Encapsulates all admin options and functionality for a given model."
+    # Avoid circular import of ChangeList
+    from django.contrib.admin.views.main import ChangeList
+    
-    __metaclass__ = forms.MediaDefiningClass
-
-    list_display = ('__str__',)
@@ -188 +191 @@
-    save_on_top = False
-    ordering = None
-    inlines = []
-
+
+
-    # Custom templates (designed to be over-ridden in subclasses)
-    change_form_template = None
-    change_list_template = None
@@ -874 +878 @@
-
-    def changelist_view(self, request, extra_context=None):
-        "The 'change list' admin view for this model."
-        from django.contrib.admin.views.main import ChangeList, ERROR_FLAG
-        opts = self.model._meta
-        app_label = opts.app_label
-        if not self.has_change_permission(request, None):
@@ -892 +895 @@
-                pass
-
-        try:
-ChangeList
+self.changelist_class
-                self.date_hierarchy, self.search_fields, self.list_select_related, self.list_per_page, self.list_editable, self)
-        except IncorrectLookupParameters:
-            # Wacky lookup parameters were given, so redirect to the main
@@ -900 +903 @@
-            # parameter via the query string. If wacky parameters were given and
-            # the 'invalid=1' parameter was already in the query string, something
-            # is screwed up with the database, so display an error page.
+            from django.contrib.admin.views.main import ERROR_FLAG
-            if ERROR_FLAG in request.GET.keys():
-                return render_to_response('admin/invalid_setup.html', {'title': _('Database error')})
-            return HttpResponseRedirect(request.path + '?' + ERROR_FLAG + '=1')

tests/regressiontests/admin_views/tests.py

@@ -1050 +1050 @@
-        self.assertEquals(len(mail.outbox), 1)
-        self.assertEquals(mail.outbox[0].subject, 'Greetings from a function action')
-
+
+class AdminCustomChangeListTest(TestCase):
+    fixtures = ['admin-views-users.xml']
+
+    def setUp(self):
+        self.client.login(username='super', password='secret')
+
+    def tearDown(self):
+        self.client.logout()
+
+    def testCustomLinkPresence(self):
+        """
+        A test to ensure that custom ChangeList class works as expected.
+        """
+        post_data = {
+            "title": u"Lion",
+        }
+        response = self.client.post('/test_admin/admin/admin_views/animal/add/', post_data)
+        self.failUnlessEqual(response.status_code, 302) # redirect somewhere
+        response = self.client.get('/test_admin/admin/admin_views/animal/')
+        self.failUnlessEqual(response.status_code, 200)
+        should_contain = """<a href="custom/1/">Lion</a>"""
+        self.assertContains(response, should_contain)
+
+
-class TestInlineNotEditable(TestCase):
-    fixtures = ['admin-views-users.xml']
-

tests/regressiontests/admin_views/models.py

@@ -184 +184 @@
-    def __unicode__(self):
-        return self.name
-
+class Animal(models.Model):
+    title = models.CharField(max_length=20)
+    def __unicode__(self):
+        return self.title
+
+class AnimalChangeList(admin.views.main.ChangeList):
+    def url_for_result(self, result):
+        return "custom/%s/" % admin.util.quote(getattr(result, self.pk_attname))
+
-class Account(models.Model):
-    """
-    A simple, generic account encapsulating the information shared by all
@@ -218 +227 @@
-        BarAccountAdmin
-    )
-
+
+class AnimalAdmin(admin.ModelAdmin):
+    changelist_class = AnimalChangeList
+
+
-class Subscriber(models.Model):
-    name = models.CharField(blank=False, max_length=80)
-    email = models.EmailField(blank=False, max_length=175)
@@ -335 +349 @@
-admin.site.register(Persona, PersonaAdmin)
-admin.site.register(Subscriber, SubscriberAdmin)
-admin.site.register(ExternalSubscriber, ExternalSubscriberAdmin)
+admin.site.register(Animal, AnimalAdmin)
-admin.site.register(OldSubscriber, OldSubscriberAdmin)
-admin.site.register(Podcast, PodcastAdmin)
-admin.site.register(Vodcast, VodcastAdmin)

tests/regressiontests/modeladmin/models.py

@@ -952 +952 @@
-...     inlines = [ValidationTestInline]
->>> validate(ValidationTestModelAdmin, ValidationTestModel)
-
+# changelist_class
+
+>>> class ValidationTestModelAdmin(ModelAdmin):
+...     changelist_class = object
+>>> validate(ValidationTestModelAdmin, ValidationTestModel)
+Traceback (most recent call last):
+...
+ImproperlyConfigured: 'ValidationTestModelAdmin.changelist_class' does not inherit from admin.views.main.ChangeList.
+
+>>> from django.contrib.admin.views.main import ChangeList
+>>> class ValidationTestChangeList(ChangeList):
+...     def url_for_result(self, result):
+...         return "custom/%s/" % quote(getattr(result, self.pk_attname))
+>>> class ValidationTestModelAdmin(ModelAdmin):
+...     changelist_class = ValidationTestChangeList
+>>> validate(ValidationTestModelAdmin, ValidationTestModel)
+
-"""
-}