From 738f4d3eb649f7afdd6575ca2b07163a8bd8ad07 Mon Sep 17 00:00:00 2001 From: Matthias Kestenholz Date: Tue, 13 Mar 2018 14:46:54 +0100 Subject: [PATCH] Adapt to the get_deleted_objects signature change --- cabinet/base_admin.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cabinet/base_admin.py b/cabinet/base_admin.py index 442e390..3f93a6b 100644 --- a/cabinet/base_admin.py +++ b/cabinet/base_admin.py @@ -1,6 +1,7 @@ from collections import defaultdict from urllib.parse import urlencode +import django from django import forms from django.contrib import admin, messages from django.contrib.admin import helpers @@ -227,8 +228,11 @@ def _folder_form_delete(self, request, obj): # Populate deleted_objects, a data structure of all related objects # that will also be deleted. - (deleted_objects, model_count, perms_needed, protected) = get_deleted_objects( # noqa - [obj], obj._meta, request.user, self.admin_site, using) + if django.VERSION < (2, 1): + (deleted_objects, model_count, perms_needed, protected) = get_deleted_objects( # noqa + [obj], obj._meta, request.user, self.admin_site, using) + else: + deleted_objects, model_count, perms_needed, protected = self.get_deleted_objects([obj], request) # noqa if protected or perms_needed: self.message_user(