Ticket #9749: patch_django_9749.20090111.diff

django/contrib/admin/validation.py

@@ -5 +5 @@
 
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 from django.forms.models import BaseModelForm, BaseModelFormSet, fields_for_model
 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']
 
@@ -138 +144 @@
         raise ImproperlyConfigured("'%s.formset' does not inherit from "
                 "BaseModelFormSet." % cls.__name__)
 
+    # exclude
+    if hasattr(cls, 'exclude') and cls.exclude:
+        fk_name = _get_foreign_key(parent_model, cls.model).name
+        if fk_name in cls.exclude:
+            raise ImproperlyConfigured("'%s.exclude' should not contain "
+                    "'%s' key because it's used in "
+                    "%s." % (cls.__name__, fk_name, parent.__name__))
+
 def validate_base(cls, model):
     opts = model._meta
 

django/contrib/admin/options.py

@@ -153 +153 @@
 
 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__',)
@@ -166 +169 @@
     save_on_top = False
     ordering = None
     inlines = []
+    changelist_class = ChangeList
 
     # Custom templates (designed to be over-ridden in subclasses)
     change_form_template = None
@@ -620 +624 @@
 
     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):
             raise PermissionDenied
         try:
-            cl = ChangeList(request, self.model, self.list_display, self.list_display_links, self.list_filter,
+            cl = self.changelist_class(request, self.model, self.list_display, self.list_display_links, self.list_filter,
                 self.date_hierarchy, self.search_fields, self.list_select_related, self.list_per_page, self)
         except IncorrectLookupParameters:
             # Wacky lookup parameters were given, so redirect to the main
@@ -634 +637 @@
             # 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/modeladmin/models.py

@@ -912 +912 @@
 ...     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)
+
 """
 }

docs/ref/contrib/admin.txt

@@ -77 +77 @@
     class AuthorAdmin(admin.ModelAdmin):
         date_hierarchy = 'pub_date'
 
+``changelist_class``
+~~~~~~~~~~~~~~~~~~
+
+Set ``changelist_class`` to a class which inherits from 
+``admin.views.main.ChangeList``, and the change list page will use this class
+to render the list.
+
+Example::
+
+    from django.contrib.admin.views.main import ChangeList
+    
+    class CustomChangeList(ChangeList):
+        def url_for_result(self, result):
+            return "custom/%s/" % quote(getattr(result, self.pk_attname))
+    
+    class AuthorAdmin(admin.ModelAdmin):
+        date_hierarchy = 'pub_date'
+        changelist_class = CustomChangeList
+    
+
 ``date_hierarchy``
 ~~~~~~~~~~~~~~~~~~