From 73fd455ea36d3f152f1df8e5734b97be1c3678d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Sun, 24 Dec 2017 17:53:28 +0100 Subject: [PATCH] fix all remaining errors with redirect slugs --- src/c3nav/editor/models/changedobject.py | 2 +- src/c3nav/editor/models/changeset.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/c3nav/editor/models/changedobject.py b/src/c3nav/editor/models/changedobject.py index 8b9490d5..67596ccd 100644 --- a/src/c3nav/editor/models/changedobject.py +++ b/src/c3nav/editor/models/changedobject.py @@ -231,7 +231,7 @@ class ChangedObject(models.Model): old_updated_fields = self.updated_fields self.updated_fields = {} - if instance.pk is None and self.model_class == LocationRedirect: + if instance.pk is None and not is_created_pk(instance.target_id) and self.model_class == LocationRedirect: obj = LocationRedirect.objects.filter(pk__in=self.changeset.deleted_existing.get(LocationRedirect, ()), slug=instance.slug, target_id=instance.target_id).first() if obj is not None: diff --git a/src/c3nav/editor/models/changeset.py b/src/c3nav/editor/models/changeset.py index 65e9ead3..2daf15ae 100644 --- a/src/c3nav/editor/models/changeset.py +++ b/src/c3nav/editor/models/changeset.py @@ -341,8 +341,8 @@ class ChangeSet(models.Model): except FieldDoesNotExist: # todo: fix this continue - objects.setdefault(LocationSlug, {})[target.pk] = target - objects.setdefault(target.__class__, {})[target.pk] = target + objects.setdefault(LocationSlug, {})[target.pk] = target._obj + objects.setdefault(target.__class__, {})[target.pk] = target._obj return objects