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

force _clean_changes() before applying a change set

Browse source
This commit is contained in:
Laura Klünder 2017-07-08 17:57:56 +02:00
parent b85d245360
commit b490497c87
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -528,8 +528,8 @@ class ChangeSet(models.Model):
self.save() self.save()
def apply(self, user): def apply(self, user):
update = self.updates.create(user=user, state='applied')
with MapUpdate.lock(): with MapUpdate.lock():
self._clean_changes()
changed_objects = self.relevant_changed_objects() changed_objects = self.relevant_changed_objects()
created_objects = [] created_objects = []
existing_objects = [] existing_objects = []
@ -602,6 +602,7 @@ class ChangeSet(models.Model):
pks = tuple(objects[field.related_model][pk].pk for pk in pks) pks = tuple(objects[field.related_model][pk].pk for pk in pks)
getattr(getattr(obj, name), mode)(*pks) getattr(getattr(obj, name), mode)(*pks)
update = self.updates.create(user=user, state='applied')
map_update = MapUpdate.objects.create(user=user, type='changeset') map_update = MapUpdate.objects.create(user=user, type='changeset')
self.state = 'applied' self.state = 'applied'
self.last_state_update = update self.last_state_update = update