diff options
| author | MaximZemskov <m.zemskov1@gmail.com> | 2019-01-11 13:13:31 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2019-01-11 18:03:23 -0500 |
| commit | 3df13847d583f0e439d03dd85e4d8d2a36e6de73 (patch) | |
| tree | 8da0643e46d7ffca31c2b7943918c68c69d0c137 /django/contrib/admin/options.py | |
| parent | 7470595459dc68f6f1677332f91fb51f5dfc2ffa (diff) | |
[2.1.x] Fixed #30097 -- Made 'obj' arg of InlineModelAdmin.has_add_permission() optional.
Restored backwards compatibility after refs #27991.
Regression in be6ca89396c031619947921c81b8795d816e3285.
Backport of 3c01fe30f3dd4dc1c8bb4fec816bd277d1ae5fa6 from master.
Diffstat (limited to 'django/contrib/admin/options.py')
| -rw-r--r-- | django/contrib/admin/options.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index bcf2a191fe..c6f42d658e 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -2127,7 +2127,8 @@ class InlineModelAdmin(BaseModelAdmin): queryset = queryset.none() return queryset - def has_add_permission(self, request, obj): + def has_add_permission(self, request, obj=None): + # RemovedInDjango31Warning: obj becomes a mandatory argument. if self.opts.auto_created: # We're checking the rights to an auto-created intermediate model, # which doesn't have its own individual permissions. The user needs |