p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #11715 -- Changed default value of ModelAdmin.actions/inlines to empty tuples. 

This clarifies the intended pattern of overwriting the default value
rather than mutating it.
This commit is contained in:
Jacob Walls 2022-01-01 11:56:10 -05:00 committed by Mariusz Felisiak
parent b111b15c12
commit dc9deea8e8
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/admin/options.py
View File

@ -565,7 +565,7 @@ class ModelAdmin(BaseModelAdmin):
save_on_top = False save_on_top = False
paginator = Paginator paginator = Paginator
preserve_filters = True preserve_filters = True
inlines = [] inlines = ()
# Custom templates (designed to be over-ridden in subclasses) # Custom templates (designed to be over-ridden in subclasses)
add_form_template = None add_form_template = None
@ -577,7 +577,7 @@ class ModelAdmin(BaseModelAdmin):
popup_response_template = None popup_response_template = None
# Actions # Actions
actions = [] actions = ()
action_form = helpers.ActionForm action_form = helpers.ActionForm
actions_on_top = True actions_on_top = True
actions_on_bottom = False actions_on_bottom = False

4
docs/releases/4.1.txt
View File

@ -341,6 +341,10 @@ Miscellaneous
``request.META['CSRF_COOKIE']`` for storing the unmasked CSRF secret rather ``request.META['CSRF_COOKIE']`` for storing the unmasked CSRF secret rather
than a masked version. This is an undocumented, private API. than a masked version. This is an undocumented, private API.
* The :attr:`.ModelAdmin.actions` and
:attr:`~django.contrib.admin.ModelAdmin.inlines` attributes now default to an
empty tuple rather than an empty list to discourage unintended mutation.
.. _deprecated-features-4.1: .. _deprecated-features-4.1:
Features deprecated in 4.1 Features deprecated in 4.1

5
tests/modeladmin/tests.py
View File

@ -50,6 +50,11 @@ class ModelAdminTests(TestCase):
ma = ModelAdmin(Band, self.site) ma = ModelAdmin(Band, self.site)
self.assertEqual(str(ma), 'modeladmin.ModelAdmin') self.assertEqual(str(ma), 'modeladmin.ModelAdmin')
def test_default_attributes(self):
ma = ModelAdmin(Band, self.site)
self.assertEqual(ma.actions, ())
self.assertEqual(ma.inlines, ())
# form/fields/fieldsets interaction ############################## # form/fields/fieldsets interaction ##############################
def test_default_fields(self): def test_default_fields(self):