From 1705faee6eb6fc0a6ac603b3fe6a0be9996f2318 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Tue, 14 Jun 2022 10:56:32 +0200 Subject: [PATCH] Reset migrations, remove APIFields --- .../learnpath/migrations/0001_initial.py | 37 +++++++++---------- server/vbv_lernwelt/learnpath/models.py | 7 ---- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/server/vbv_lernwelt/learnpath/migrations/0001_initial.py b/server/vbv_lernwelt/learnpath/migrations/0001_initial.py index 25ad92f0..2cfc21af 100644 --- a/server/vbv_lernwelt/learnpath/migrations/0001_initial.py +++ b/server/vbv_lernwelt/learnpath/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.13 on 2022-06-08 12:08 +# Generated by Django 3.2.13 on 2022-06-14 08:51 from django.db import migrations, models import django.db.models.deletion @@ -17,6 +17,20 @@ class Migration(migrations.Migration): ] operations = [ + migrations.CreateModel( + name='Circle', + 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')), + ('description', models.TextField(blank=True, default='')), + ('goals', wagtail.fields.StreamField([('goal', wagtail.blocks.TextBlock())], use_json_field=True)), + ('job_situations', wagtail.fields.StreamField([('job_situation', wagtail.blocks.CharBlock())], use_json_field=True)), + ('experts', wagtail.fields.StreamField([('person', wagtail.blocks.StructBlock([('first_name', wagtail.blocks.CharBlock()), ('last_name', wagtail.blocks.CharBlock()), ('email', wagtail.blocks.EmailBlock()), ('photo', wagtail.images.blocks.ImageChooserBlock(required=False)), ('biography', wagtail.blocks.RichTextBlock(required=False))]))], use_json_field=True)), + ], + options={ + 'verbose_name': 'Circle', + }, + bases=('wagtailcore.page',), + ), migrations.CreateModel( name='Competence', fields=[ @@ -86,15 +100,13 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Topic', fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), - ('title', models.TextField(default='')), + ('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')), ('is_visible', models.BooleanField(default=True)), - ('learning_path', modelcluster.fields.ParentalKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='topics', to='learnpath.learningpath')), ], options={ 'verbose_name': 'Topic', }, + bases=('wagtailcore.page',), ), migrations.CreateModel( name='FullfillmentCriteria', @@ -113,19 +125,4 @@ class Migration(migrations.Migration): name='competence_page', field=modelcluster.fields.ParentalKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='competences', to='learnpath.competencepage'), ), - migrations.CreateModel( - name='Circle', - 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')), - ('description', models.TextField(blank=True, default='')), - ('goals', wagtail.fields.StreamField([('goal', wagtail.blocks.TextBlock())], use_json_field=True)), - ('job_situations', wagtail.fields.StreamField([('job_situation', wagtail.blocks.CharBlock())], use_json_field=True)), - ('experts', wagtail.fields.StreamField([('person', wagtail.blocks.StructBlock([('first_name', wagtail.blocks.CharBlock()), ('last_name', wagtail.blocks.CharBlock()), ('email', wagtail.blocks.EmailBlock()), ('photo', wagtail.images.blocks.ImageChooserBlock(required=False)), ('biography', wagtail.blocks.RichTextBlock(required=False))]))], use_json_field=True)), - ('topic', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='circles', to='learnpath.topic')), - ], - options={ - 'verbose_name': 'Circle', - }, - bases=('wagtailcore.page',), - ), ] diff --git a/server/vbv_lernwelt/learnpath/models.py b/server/vbv_lernwelt/learnpath/models.py index c65e867f..fdc5896b 100644 --- a/server/vbv_lernwelt/learnpath/models.py +++ b/server/vbv_lernwelt/learnpath/models.py @@ -2,7 +2,6 @@ from django.utils.text import slugify from wagtail import blocks -from wagtail.api import APIField from wagtail.blocks import StreamBlock from wagtail.fields import StreamField from wagtail.images.blocks import ImageChooserBlock @@ -37,11 +36,6 @@ class Topic(Page): FieldPanel('is_visible'), ] - api_fields = [ - APIField('title'), - APIField('is_visible'), - ] - # content_panels = Page.content_panels + [ # FieldPanel('is_visible', classname="full"), # PageChooserPanel('learning_path', 'learnpath.LearningPath'), @@ -98,7 +92,6 @@ class Circle(Page): FieldPanel('goals'), FieldPanel('job_situations'), FieldPanel('experts'), - APIField('learning_sequences'), ] @property