From 554dae08ad95a15d12ef0ff738e154f6aacd5836 Mon Sep 17 00:00:00 2001 From: Tomasz Knapik Date: Thu, 10 Aug 2017 12:07:54 +0100 Subject: [PATCH] Fix migrations for two different PRs (see comment on #115) --- .../migrations/0088_staffpage_migrate_area_data_to_roles.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/django-verdant/rca/migrations/0088_staffpage_migrate_area_data_to_roles.py b/django-verdant/rca/migrations/0088_staffpage_migrate_area_data_to_roles.py index 8624110f8..03e12ac76 100644 --- a/django-verdant/rca/migrations/0088_staffpage_migrate_area_data_to_roles.py +++ b/django-verdant/rca/migrations/0088_staffpage_migrate_area_data_to_roles.py @@ -23,7 +23,7 @@ def move_area_data(apps, schema_editor): for staff in records: first_role = staff.roles.filter(area__isnull=True).first() - + # Update revisions if staff.has_unpublished_changes: # Can't use get_latest_revision() as I am unable to call @@ -40,7 +40,7 @@ def move_area_data(apps, schema_editor): revision.content_json = json.dumps(revision_json) revision.save() - + if first_role is not None: print('Updating live version of {} (#{}).'.format(staff, staff.pk)) @@ -51,6 +51,7 @@ def move_area_data(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ ('rca', '0087_doubleclickcampaignmanageractivities'), + ('taxonomy', '0022_move_area_content_types'), ] operations = [