Skip to content
Open
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions specifyweb/specify/api/crud.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,6 @@ def update_obj(collection, agent, name: str, id, version, data: dict[str, Any],

def delete_obj(obj, deleter: Callable[[Any, Any], None] | None=None, version=None, parent_obj=None, clean_predelete=None) -> None:
# need to delete dependent -to-one records
# e.g. delete CollectionObjectAttribute when CollectionObject is deleted
# but have to delete the referring record first
dependents_to_delete = [_f for _f in (
get_related_or_none(obj, field.name)
for field in obj._meta.get_fields()
Expand All @@ -172,14 +170,19 @@ def delete_obj(obj, deleter: Callable[[Any, Any], None] | None=None, version=Non

if hasattr(obj, 'pre_constraints_delete'):
obj.pre_constraints_delete()
# store obj id and class before deletion to avoid accessing deleted obj
obj_id = obj.id

if deleter:
if deleter and (obj_id is not None):
deleter(obj, parent_obj)

obj.delete()

# before delete obj, store dep id to avoid accessing deleted obj in recursive delete calls
for dep in dependents_to_delete:
delete_obj(dep, deleter, version, parent_obj=obj, clean_predelete=clean_predelete)
dep_id = dep.id
if dep_id is not None:
delete_obj(dep, deleter, version, parent_obj=obj, clean_predelete=clean_predelete)

def update_or_create_resource(collection, agent, model, data, parent_obj, parent_relationship=None):
if 'id' in data:
Expand Down
Loading