Skip to content

Fix deletion of inherited models #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ron8mcr wants to merge 2 commits into
base: master
Choose a base branch
from
+19 −3
Open

Fix deletion of inherited models #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69759a9
Fix deletion of inherted models
ron8mcr Dec 27, 2016
9cc99f3
Fix deletion of related objects
ron8mcr Jan 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions pinax/models/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,28 @@ def active(self):
return self.date_removed is None
active.boolean = True

def delete(self):
def delete(self, _collect_related=True):
"""Soft-delete the object.

Args:
_collect_related(bool): is deletion of this object requires to
collect and delete some related objects.

`_collect_related` used with cascade deletion. Just root object
should collect related objects. If related objects will also start to
collect realted objects we may fail into endless recursion
"""
# Fetch related models
to_delete = get_related_objects(self)
if _collect_related:
to_delete = get_related_objects(self)
else:
to_delete = []

for obj in to_delete:
obj.delete()
if isinstance(obj, LogicalDeleteModel):
obj.delete(_collect_related=False)
else:
obj.delete()

# Soft delete the object
self.date_removed = timezone.now()
Expand Down