From de56fa45c2b2df65d618c12e1a140e4141d5e903 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Mon, 6 Aug 2018 12:40:02 +0100
Subject: [PATCH] Revert changes and correctly fix to use the field_values
---
.../apply/funds/migrations/0038_recreate_objects_that_exist.py | 3 +--
opentech/public/funds/migrations/0008_recreate_pages.py | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/opentech/apply/funds/migrations/0038_recreate_objects_that_exist.py b/opentech/apply/funds/migrations/0038_recreate_objects_that_exist.py
index c6937ad85..05f5d7090 100644
--- a/opentech/apply/funds/migrations/0038_recreate_objects_that_exist.py
+++ b/opentech/apply/funds/migrations/0038_recreate_objects_that_exist.py
@@ -29,10 +29,9 @@ def recreate_objects(apps, schema_editor):
f'{new_model_name.lower()}_ptr': obj,
'draft_title': obj.draft_title,
'content_type': content_type,
- 'depth': obj.depth,
}
field_values.update(**kwargs)
- new_obj = model(**kwargs)
+ new_obj = model(**field_values)
new_obj.save()
diff --git a/opentech/public/funds/migrations/0008_recreate_pages.py b/opentech/public/funds/migrations/0008_recreate_pages.py
index 8d0f5aad9..173419040 100644
--- a/opentech/public/funds/migrations/0008_recreate_pages.py
+++ b/opentech/public/funds/migrations/0008_recreate_pages.py
@@ -20,14 +20,13 @@ def recreate_objects(apps, schema_editor):
for obj in new_model.objects.all():
field_values = {}
for field in obj._meta.fields:
- if field.name not in ['page_ptr']:
+ if field.name not in ['page_ptr', 'path']:
field_values[field.name] = getattr(obj, field.name)
kwargs = {
f'{new_model_name.lower()}_ptr': obj,
'draft_title': obj.draft_title,
'content_type': content_type,
- 'depth': obj.depth,
}
field_values.update(**kwargs)
new_obj = model(**field_values)
--
GitLab