From 3df13847d583f0e439d03dd85e4d8d2a36e6de73 Mon Sep 17 00:00:00 2001 From: MaximZemskov Date: Fri, 11 Jan 2019 13:13:31 +0300 Subject: [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. --- docs/ref/contrib/admin/index.txt | 4 +++- docs/releases/2.1.6.txt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index bd5547449f..d99552fb9a 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -2417,7 +2417,9 @@ The ``InlineModelAdmin`` class adds or customizes: .. versionchanged:: 2.1 - The ``obj`` argument was added. + The ``obj`` argument was added. During the deprecation period, it may + also be ``None`` if third-party calls to ``has_add_permission()`` don't + provide it. .. method:: InlineModelAdmin.has_change_permission(request, obj=None) diff --git a/docs/releases/2.1.6.txt b/docs/releases/2.1.6.txt index 894eb160b2..d5f342f546 100644 --- a/docs/releases/2.1.6.txt +++ b/docs/releases/2.1.6.txt @@ -9,4 +9,6 @@ Django 2.1.6 several bugs in 2.1.5. Bugfixes ======== -* ... +* Made the ``obj`` argument of ``InlineModelAdmin.has_add_permission()`` + optional to restore backwards compatibility with third-party code that + doesn't provide it (:ticket:`30097`). -- cgit v1.3