Skip to content

Commit

Permalink
Adapt to the get_deleted_objects signature change
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiask committed Mar 13, 2018
1 parent aaea308 commit 738f4d3
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions cabinet/base_admin.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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(
Expand Down

0 comments on commit 738f4d3

Please sign in to comment.