From 3081cb4cd2d7918264a21955ed1fe546c58ca067 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Tue, 10 Dec 2019 15:30:23 +0100 Subject: [PATCH] Clean up migration conflicts --- .../migrations/0010_auto_20191210_1427.py | 19 +++++++++++++++ .../migrations/0004_auto_20191112_1413.py | 21 ---------------- .../migrations/0016_auto_20191112_1413.py | 24 ------------------- 3 files changed, 19 insertions(+), 45 deletions(-) create mode 100644 server/assignments/migrations/0010_auto_20191210_1427.py delete mode 100644 server/basicknowledge/migrations/0004_auto_20191112_1413.py delete mode 100644 server/books/migrations/0016_auto_20191112_1413.py diff --git a/server/assignments/migrations/0010_auto_20191210_1427.py b/server/assignments/migrations/0010_auto_20191210_1427.py new file mode 100644 index 00000000..f7145c5a --- /dev/null +++ b/server/assignments/migrations/0010_auto_20191210_1427.py @@ -0,0 +1,19 @@ +# Generated by Django 2.0.6 on 2019-12-10 14:27 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('assignments', '0009_auto_20191113_1433'), + ] + + operations = [ + migrations.AlterField( + model_name='submissionfeedback', + name='student_submission', + field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='submission_feedback', serialize=False, to='assignments.StudentSubmission'), + ), + ] diff --git a/server/basicknowledge/migrations/0004_auto_20191112_1413.py b/server/basicknowledge/migrations/0004_auto_20191112_1413.py deleted file mode 100644 index 14d7396a..00000000 --- a/server/basicknowledge/migrations/0004_auto_20191112_1413.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.0.6 on 2019-11-12 14:13 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('basicknowledge', '0003_auto_20190912_1228'), - ] - - operations = [ - migrations.AlterField( - model_name='basicknowledge', - name='contents', - field=wagtail.core.fields.StreamField([('text_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock(features=['bold', 'ul']))])), ('image_block', wagtail.images.blocks.ImageChooserBlock()), ('link_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('video_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())])), ('document_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())])), ('section_title', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock())])), ('infogram_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock()), ('title', wagtail.core.blocks.TextBlock())])), ('genially_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock())])), ('thinglink_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock())])), ('subtitle', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock())]))], blank=True, null=True), - ), - ] diff --git a/server/books/migrations/0016_auto_20191112_1413.py b/server/books/migrations/0016_auto_20191112_1413.py deleted file mode 100644 index ce6ead32..00000000 --- a/server/books/migrations/0016_auto_20191112_1413.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.0.6 on 2019-11-12 14:13 - -import assignments.models -from django.db import migrations -import surveys.models -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks -import wagtail.snippets.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('books', '0015_contentblock_bookmarks'), - ] - - operations = [ - migrations.AlterField( - model_name='contentblock', - name='contents', - field=wagtail.core.fields.StreamField([('text_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock(features=['ul']))])), ('basic_knowledge', wagtail.core.blocks.StructBlock([('description', wagtail.core.blocks.RichTextBlock(required=False)), ('basic_knowledge', wagtail.core.blocks.PageChooserBlock(required=True, target_model=['basicknowledge.BasicKnowledge']))])), ('assignment', wagtail.core.blocks.StructBlock([('assignment_id', wagtail.snippets.blocks.SnippetChooserBlock(assignments.models.Assignment))])), ('survey', wagtail.core.blocks.StructBlock([('survey_id', wagtail.snippets.blocks.SnippetChooserBlock(surveys.models.Survey))])), ('image_block', wagtail.images.blocks.ImageChooserBlock()), ('image_url_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('link_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('solution', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock(features=['ul']))], icon='tick')), ('video_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())])), ('document_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())])), ('infogram_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock()), ('title', wagtail.core.blocks.TextBlock())])), ('genially_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock())])), ('thinglink_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock())])), ('subtitle', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock())])), ('module_room_slug', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.TextBlock())])), ('content_list_item', wagtail.core.blocks.StreamBlock([('text_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock(features=['ul']))])), ('basic_knowledge', wagtail.core.blocks.StructBlock([('description', wagtail.core.blocks.RichTextBlock(required=False)), ('basic_knowledge', wagtail.core.blocks.PageChooserBlock(required=True, target_model=['basicknowledge.BasicKnowledge']))])), ('assignment', wagtail.core.blocks.StructBlock([('assignment_id', wagtail.snippets.blocks.SnippetChooserBlock(assignments.models.Assignment))])), ('survey', wagtail.core.blocks.StructBlock([('survey_id', wagtail.snippets.blocks.SnippetChooserBlock(surveys.models.Survey))])), ('image_block', wagtail.images.blocks.ImageChooserBlock()), ('image_url_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('link_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('solution', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock(features=['ul']))], icon='tick')), ('video_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())])), ('document_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())])), ('infogram_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock()), ('title', wagtail.core.blocks.TextBlock())])), ('genially_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock())])), ('thinglink_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock())])), ('subtitle', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock())])), ('module_room_slug', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.TextBlock())]))]))], blank=True, null=True), - ), - ]