From c32372c53569cba7d1cbc60938fecd4f1963a5f4 Mon Sep 17 00:00:00 2001 From: Pawel Kowalski Date: Thu, 23 Aug 2018 13:55:36 +0200 Subject: [PATCH] Reset all migrations --- server/api/schema.py | 3 ++ server/book/migrations/0001_initial.py | 4 +-- .../migrations/0002_auto_20180823_1027.py | 21 -------------- server/objectives/migrations/0001_initial.py | 2 +- ...816_1524.py => 0002_auto_20180823_1148.py} | 2 +- server/rooms/migrations/0001_initial.py | 10 +++---- .../migrations/0002_auto_20180823_1123.py | 29 ------------------- .../rooms/migrations/0002_room_user_group.py | 22 ++++++++++++++ server/user/migrations/0001_initial.py | 14 ++++++++- server/user/migrations/0002_usergroup.py | 25 ---------------- 10 files changed, 47 insertions(+), 85 deletions(-) delete mode 100644 server/book/migrations/0002_auto_20180823_1027.py rename server/objectives/migrations/{0002_auto_20180816_1524.py => 0002_auto_20180823_1148.py} (96%) delete mode 100644 server/rooms/migrations/0002_auto_20180823_1123.py create mode 100644 server/rooms/migrations/0002_room_user_group.py delete mode 100644 server/user/migrations/0002_usergroup.py diff --git a/server/api/schema.py b/server/api/schema.py index 08d1d73d..100af16f 100644 --- a/server/api/schema.py +++ b/server/api/schema.py @@ -6,6 +6,9 @@ from book.schema import BookQuery from objectives.schema import ObjectivesQuery from rooms.schema import RoomsQuery +# Keep this import here, it's necessary for StreamField conversion +from api import graphene_wagtail + class Query(RoomsQuery, ObjectivesQuery, BookQuery, graphene.ObjectType): # This class will inherit from multiple Queries diff --git a/server/book/migrations/0001_initial.py b/server/book/migrations/0001_initial.py index c9c33c82..7f3cf273 100644 --- a/server/book/migrations/0001_initial.py +++ b/server/book/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.0.6 on 2018-08-16 15:24 +# Generated by Django 2.0.6 on 2018-08-23 11:48 from django.db import migrations, models import django.db.models.deletion @@ -43,7 +43,7 @@ class Migration(migrations.Migration): name='ContentBlock', fields=[ ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), - ('contents', wagtail.core.fields.StreamField([('text_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock())], icon='doc-full')), ('modal_text', wagtail.core.blocks.StructBlock([('description', wagtail.core.blocks.RichTextBlock()), ('url', wagtail.core.blocks.URLBlock())], icon='placeholder')), ('student_entry', wagtail.core.blocks.StructBlock([('task_text', wagtail.core.blocks.RichTextBlock())], icon='download')), ('image_block', wagtail.images.blocks.ImageChooserBlock(icon='image')), ('task', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock())], icon='tick'))], blank=True, null=True)), + ('contents', wagtail.core.fields.StreamField([('text_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock())], icon='doc-full')), ('basic_knowledge', wagtail.core.blocks.StructBlock([('description', wagtail.core.blocks.RichTextBlock()), ('url', wagtail.core.blocks.URLBlock())], icon='placeholder')), ('student_entry', wagtail.core.blocks.StructBlock([('task_text', wagtail.core.blocks.RichTextBlock())], icon='download')), ('image_block', wagtail.images.blocks.ImageChooserBlock(icon='image')), ('task', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock())], icon='tick'))], blank=True, null=True)), ('type', models.CharField(choices=[('plain', 'Normal'), ('yellow', 'Gelb'), ('green', 'Grün'), ('blue', 'Blau')], max_length=100)), ], options={ diff --git a/server/book/migrations/0002_auto_20180823_1027.py b/server/book/migrations/0002_auto_20180823_1027.py deleted file mode 100644 index 3684694b..00000000 --- a/server/book/migrations/0002_auto_20180823_1027.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.0.6 on 2018-08-23 10:27 - -from django.db import migrations -import wagtail.core.blocks -import wagtail.core.fields -import wagtail.images.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('book', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='contentblock', - name='contents', - field=wagtail.core.fields.StreamField([('text_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock())], icon='doc-full')), ('basic_knowledge', wagtail.core.blocks.StructBlock([('description', wagtail.core.blocks.RichTextBlock()), ('url', wagtail.core.blocks.URLBlock())], icon='placeholder')), ('student_entry', wagtail.core.blocks.StructBlock([('task_text', wagtail.core.blocks.RichTextBlock())], icon='download')), ('image_block', wagtail.images.blocks.ImageChooserBlock(icon='image')), ('task', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock())], icon='tick'))], blank=True, null=True), - ), - ] diff --git a/server/objectives/migrations/0001_initial.py b/server/objectives/migrations/0001_initial.py index 176ab88c..c957432a 100644 --- a/server/objectives/migrations/0001_initial.py +++ b/server/objectives/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.0.6 on 2018-08-16 15:24 +# Generated by Django 2.0.6 on 2018-08-23 11:48 from django.db import migrations, models import django.db.models.deletion diff --git a/server/objectives/migrations/0002_auto_20180816_1524.py b/server/objectives/migrations/0002_auto_20180823_1148.py similarity index 96% rename from server/objectives/migrations/0002_auto_20180816_1524.py rename to server/objectives/migrations/0002_auto_20180823_1148.py index da762841..50e8dff5 100644 --- a/server/objectives/migrations/0002_auto_20180816_1524.py +++ b/server/objectives/migrations/0002_auto_20180823_1148.py @@ -1,4 +1,4 @@ -# Generated by Django 2.0.6 on 2018-08-16 15:24 +# Generated by Django 2.0.6 on 2018-08-23 11:48 from django.conf import settings from django.db import migrations, models diff --git a/server/rooms/migrations/0001_initial.py b/server/rooms/migrations/0001_initial.py index 2f7d48ae..7ea33994 100644 --- a/server/rooms/migrations/0001_initial.py +++ b/server/rooms/migrations/0001_initial.py @@ -1,7 +1,7 @@ -# Generated by Django 2.0.6 on 2018-08-23 10:14 +# Generated by Django 2.0.6 on 2018-08-23 11:48 from django.db import migrations, models -import django.db.models.deletion +import django_extensions.db.fields class Migration(migrations.Migration): @@ -9,7 +9,6 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('user', '0002_usergroup'), ] operations = [ @@ -17,9 +16,10 @@ class Migration(migrations.Migration): name='Room', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(blank=True, max_length=255)), + ('title', models.CharField(max_length=255, verbose_name='title')), + ('description', models.TextField(blank=True, null=True, verbose_name='description')), + ('slug', django_extensions.db.fields.AutoSlugField(blank=True, editable=False, populate_from='title', verbose_name='slug')), ('appearance', models.CharField(blank=True, max_length=255)), - ('user_group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='user.UserGroup')), ], options={ 'verbose_name': 'Raum', diff --git a/server/rooms/migrations/0002_auto_20180823_1123.py b/server/rooms/migrations/0002_auto_20180823_1123.py deleted file mode 100644 index bee77f84..00000000 --- a/server/rooms/migrations/0002_auto_20180823_1123.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.0.6 on 2018-08-23 11:23 - -from django.db import migrations, models -import django_extensions.db.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('rooms', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='room', - name='description', - field=models.TextField(blank=True, null=True, verbose_name='description'), - ), - migrations.AddField( - model_name='room', - name='slug', - field=django_extensions.db.fields.AutoSlugField(blank=True, editable=False, populate_from='title', verbose_name='slug'), - ), - migrations.AlterField( - model_name='room', - name='title', - field=models.CharField(max_length=255, verbose_name='title'), - ), - ] diff --git a/server/rooms/migrations/0002_room_user_group.py b/server/rooms/migrations/0002_room_user_group.py new file mode 100644 index 00000000..272c7e1f --- /dev/null +++ b/server/rooms/migrations/0002_room_user_group.py @@ -0,0 +1,22 @@ +# Generated by Django 2.0.6 on 2018-08-23 11:48 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('rooms', '0001_initial'), + ('user', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='room', + name='user_group', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='user.UserGroup'), + ), + ] diff --git a/server/user/migrations/0001_initial.py b/server/user/migrations/0001_initial.py index 67ac96ff..9b014e4b 100644 --- a/server/user/migrations/0001_initial.py +++ b/server/user/migrations/0001_initial.py @@ -1,7 +1,9 @@ -# Generated by Django 2.0.6 on 2018-08-16 15:24 +# Generated by Django 2.0.6 on 2018-08-23 11:48 +from django.conf import settings import django.contrib.auth.models import django.contrib.auth.validators +import django.core.validators from django.db import migrations, models import django.utils.timezone @@ -41,4 +43,14 @@ class Migration(migrations.Migration): ('objects', django.contrib.auth.models.UserManager()), ], ), + migrations.CreateModel( + name='UserGroup', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=100)), + ('year', models.PositiveIntegerField(validators=[django.core.validators.MinValueValidator(1900), django.core.validators.MaxValueValidator(2200)])), + ('is_deleted', models.BooleanField(default=False)), + ('users', models.ManyToManyField(to=settings.AUTH_USER_MODEL)), + ], + ), ] diff --git a/server/user/migrations/0002_usergroup.py b/server/user/migrations/0002_usergroup.py deleted file mode 100644 index fe95d1f1..00000000 --- a/server/user/migrations/0002_usergroup.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 2.0.6 on 2018-08-23 10:14 - -from django.conf import settings -import django.core.validators -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('user', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='UserGroup', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('year', models.PositiveIntegerField(validators=[django.core.validators.MinValueValidator(1900), django.core.validators.MaxValueValidator(2200)])), - ('is_deleted', models.BooleanField(default=False)), - ('users', models.ManyToManyField(to=settings.AUTH_USER_MODEL)), - ], - ), - ]