Fixes #2141. Resolve issue with merge_person_records caused by Django 1.8 upgrade. Commit ready for merge.
- Legacy-Id: 12724
This commit is contained in:
parent
93b1ba1e8f
commit
68bd38d22d
|
@ -165,10 +165,11 @@ def main():
|
||||||
user = User.objects.filter(is_superuser=True).first()
|
user = User.objects.filter(is_superuser=True).first()
|
||||||
admin_site = admin.site
|
admin_site = admin.site
|
||||||
using = 'default'
|
using = 'default'
|
||||||
deletable_objects, perms_needed, protected = admin.utils.get_deleted_objects(
|
deletable_objects = admin.utils.get_deleted_objects(
|
||||||
objs, opts, user, admin_site, using)
|
objs, opts, user, admin_site, using)
|
||||||
|
|
||||||
if len(deletable_objects) > 1:
|
deletable_objects_summary = deletable_objects[1]
|
||||||
|
if len(deletable_objects_summary) > 1: # should only inlcude one object (Person)
|
||||||
print "Not Deleting Person: {}({})".format(source.ascii,source.pk)
|
print "Not Deleting Person: {}({})".format(source.ascii,source.pk)
|
||||||
print "Related objects remain:"
|
print "Related objects remain:"
|
||||||
pprint.pprint(deletable_objects[1])
|
pprint.pprint(deletable_objects[1])
|
||||||
|
|
Loading…
Reference in a new issue