Ticket #11651: customize_list_editable4.diff

django/contrib/admin/options.py

@@ -73 +73 @@
         overrides.update(self.formfield_overrides)
         self.formfield_overrides = overrides
 
+    def formfield_changelist_for_dbfield(self, db_field, **kwargs):
+        """
+        Hook for specifying the form Field instance for a given database Field
+        instance when using 'list_editable' on the changelist.
+
+        By default, returns formfield_for_dbfield.
+        """
+        return self.formfield_for_dbfield(db_field, **kwargs)
+
     def formfield_for_dbfield(self, db_field, **kwargs):
         """
         Hook for specifying the form Field instance for a given database Field
@@ -392 +401 @@
         Returns a Form class for use in the Formset on the changelist page.
         """
         defaults = {
-            "formfield_callback": curry(self.formfield_for_dbfield, request=request),
+            "formfield_callback": curry(self.formfield_changelist_for_dbfield, request=request),
         }
         defaults.update(kwargs)
         return modelform_factory(self.model, **defaults)
@@ -403 +412 @@
         is used.
         """
         defaults = {
-            "formfield_callback": curry(self.formfield_for_dbfield, request=request),
+            "formfield_callback": curry(self.formfield_changelist_for_dbfield, request=request),
         }
         defaults.update(kwargs)
         return modelformset_factory(self.model,

docs/ref/contrib/admin/index.txt

@@ -853 +853 @@
 
     (r'^my_view/$', self.admin_site.admin_view(self.my_view, cacheable=True))
 
+.. method:: ModelAdmin.formfield_for_dbfield(self, db_field, **kwargs)
+
+The ``formfield_for_dbfield`` method on a ``ModelAdmin`` allows you to
+override the default formfield used for a given database field.
+
+.. method:: ModelAdmin.formfield_changelist_for_dbfield(self, db_field, **kwargs)
+
+.. versionadded:: 1.3
+
+The ``formfield_changelist_for_dbfield`` method on a ``ModelAdmin`` allows you to
+override the default formfields used on a changelist page when list_editable is enabled.
+Use this method to override a formfield only on the changelist. For example, to set
+a CSS class for certain fields::
+
+    class MyModelAdmin(admin.ModelAdmin):
+        def formfield_changelist_for_dbfield(self, db_field, **kwargs):
+            field = super(MyModelAdmin, self).formfield_changelist_for_dbfield(db_field, **kwargs)
+            if db_field.name in ('short_field_1', 'short_field_2'):
+                field.widget.attrs['class']='smaller'
+            return field
+
+By default, this method just returns the result of ``formfield_for_dbfield``.
+
 .. method:: ModelAdmin.formfield_for_foreignkey(self, db_field, request, **kwargs)
 
 .. versionadded:: 1.1

tests/regressiontests/admin_views/customadmin.py

@@ -26 +26 @@
     def my_view(self, request):
         return HttpResponse("Django is a magical pony!")
 
-site = Admin2(name="admin2")
+site2 = Admin2(name="admin2")
 
-site.register(models.Article, models.ArticleAdmin)
-site.register(models.Section, inlines=[models.ArticleInline])
-site.register(models.Thing, models.ThingAdmin)
-site.register(models.Fabric, models.FabricAdmin)
+site2.register(models.Article, models.ArticleAdmin)
+site2.register(models.Section, inlines=[models.ArticleInline])
+site2.register(models.Thing, models.ThingAdmin)
+site2.register(models.Fabric, models.FabricAdmin)
+
+
+class Admin3(admin.AdminSite): pass
+
+site3 = Admin2(name="admin3")
+site3.register(models.Article, models.CustomFieldsArticleAdmin)
+site3.register(models.Section, inlines=[models.ArticleInline])
+site3.register(models.Thing, models.ThingAdmin)
+site3.register(models.Fabric, models.FabricAdmin)

tests/regressiontests/admin_views/models.py

@@ -106 +106 @@
     modeladmin_year.admin_order_field = 'date'
     modeladmin_year.short_description = None
 
+class CustomFieldsArticleAdmin(admin.ModelAdmin):
+    list_display = ('pk', 'content', 'date')
+    list_editable = ('content', 'date')
+
+    def formfield_for_dbfield(self, db_field, **kwargs):
+        field = super(CustomFieldsArticleAdmin, self).formfield_for_dbfield(db_field, **kwargs)
+        if db_field.name == 'content':
+            field.widget.attrs['class']='larger'
+        return field
+
+    def formfield_changelist_for_dbfield(self, db_field, **kwargs):
+        field = super(CustomFieldsArticleAdmin, self).formfield_changelist_for_dbfield(db_field, **kwargs)
+        if db_field.name == 'content':
+            field.widget.attrs['class']='smaller'
+        return field
+
+
 class CustomArticle(models.Model):
     content = models.TextField()
     date = models.DateTimeField()

tests/regressiontests/admin_views/tests.py

@@ -360 +360 @@
         response = self.client.get('/test_admin/%s/my_view/' % self.urlbit)
         self.assert_(response.content == "Django is a magical pony!", response.content)
 
+class CustomFieldsAdminTest(TestCase):
+    fixtures = ['admin-views-users.xml', 'admin-views-colors.xml', 'admin-views-fabrics.xml']
+
+    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 testCustomFormField(self):
+        response = self.client.get('/test_admin/admin3/admin_views/article/1/')
+        self.failUnlessEqual(response.status_code, 200)
+        self.failUnless('class="larger"' in response.content)
+        self.failIf('class="smaller"' in response.content)
+
+    def testCustomFormFieldOnList(self):
+        response = self.client.get('/test_admin/admin3/admin_views/article/')
+        self.failUnlessEqual(response.status_code, 200)
+        self.failUnless('class="smaller"' in response.content)
+        self.failIf('class="larger"' in response.content)
+
 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

@@ -7 +7 @@
     (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'^admin2/', include(customadmin.site2.urls)),
+    (r'^admin3/', include(customadmin.site3.urls)),
 )