diff --git a/xadmin/plugins/actions.py b/xadmin/plugins/actions.py index cd82518ff..d3c244001 100644 --- a/xadmin/plugins/actions.py +++ b/xadmin/plugins/actions.py @@ -100,7 +100,7 @@ def do_action(self, queryset): # Populate deletable_objects, a data structure of all related objects that # will also be deleted. - if django_version > (2, 0): + if django_version > (2, 1): deletable_objects, model_count, perms_needed, protected = get_deleted_objects( queryset, self.opts, self.admin_site) else: @@ -108,6 +108,7 @@ def do_action(self, queryset): deletable_objects, model_count, perms_needed, protected = get_deleted_objects( queryset, self.opts, self.user, self.admin_site, using) + # The user has already confirmed the deletion. # Do the deletion and return a None to display the change list view again. if self.request.POST.get('post'): diff --git a/xadmin/views/delete.py b/xadmin/views/delete.py index 860b31417..2dc4fd06b 100644 --- a/xadmin/views/delete.py +++ b/xadmin/views/delete.py @@ -39,7 +39,7 @@ def init_request(self, object_id, *args, **kwargs): # Populate deleted_objects, a data structure of all related objects that # will also be deleted. - if django_version > (2, 0): + if django_version > (2, 1): (self.deleted_objects, model_count, self.perms_needed, self.protected) = get_deleted_objects( [self.obj], self.opts, self.admin_site) else: