2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

get_objects() should return dummy model instances for deleted objects

Browse source
This commit is contained in:
Laura Klünder 2017-07-08 14:29:41 +02:00
parent f5c234ce34
commit 9e4257e36e
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/c3nav/editor/models/changeset.py
View file

@ -264,13 +264,17 @@ class ChangeSet(models.Model):
for change in changed_objects: for change in changed_objects:
change.add_relevant_object_pks(object_pks, many=many) change.add_relevant_object_pks(object_pks, many=many)
# create dummy objects for deleted ones
objects = {}
for model, pks in object_pks.items():
objects[model] = {pk: model(pk=pk) for pk in pks}
slug_submodels = tuple(model for model in object_pks.keys() if issubclass(model, LocationSlug)) slug_submodels = tuple(model for model in object_pks.keys() if issubclass(model, LocationSlug))
object_pks[LocationSlug] = reduce(operator.or_, (object_pks[model] for model in slug_submodels)) object_pks[LocationSlug] = reduce(operator.or_, (object_pks[model] for model in slug_submodels))
for model in slug_submodels: for model in slug_submodels:
object_pks.pop(model) object_pks.pop(model)
# retrieve relevant objects # retrieve relevant objects
objects = {}
for model, pks in object_pks.items(): for model, pks in object_pks.items():
if not pks: if not pks:
continue continue
@ -552,8 +556,8 @@ class ChangeSet(models.Model):
for existing_object in existing_objects: for existing_object in existing_objects:
if not existing_object.deleted and not issubclass(existing_object.model_class, LocationRedirect): if not existing_object.deleted and not issubclass(existing_object.model_class, LocationRedirect):
continue continue
model = created_object.model_class model = existing_object.model_class
pk = created_object.obj_pk pk = existing_object.obj_pk
obj = objects[model][pk] obj = objects[model][pk]
obj.delete() obj.delete()