From: Yoan Le Clanche Date: Thu, 13 Jan 2022 13:46:15 +0000 (+0100) Subject: Fix migrations X-Git-Tag: 2.8.1-pro~125 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c59b9e27882396851c21fbafb711f858f7c63a9e;p=teleforma.git Fix migrations --- diff --git a/teleforma/migrations/0001_initial.py b/teleforma/migrations/0001_initial.py index 4e769996..fdf86fc7 100644 --- a/teleforma/migrations/0001_initial.py +++ b/teleforma/migrations/0001_initial.py @@ -184,6 +184,7 @@ class Migration(migrations.Migration): ('conference', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='media', to='teleforma.conference', verbose_name='conference')), ('course', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='media', to='teleforma.course', verbose_name='course')), ('course_type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='media', to='teleforma.coursetype', verbose_name='course type')), + ('approx_duration', teleforma.fields.DurationField(blank=True, default='0', verbose_name='approximative duration')), ], options={ 'db_table': 'teleforma_media', @@ -278,6 +279,7 @@ class Migration(migrations.Migration): ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')), ('suggested_conferences', models.ManyToManyField(blank=True, related_name='seminars_related', to='teleforma.Conference', verbose_name='suggested conferences')), ('suggested_seminars', models.ManyToManyField(blank=True, related_name='seminars_related', to='teleforma.Seminar', verbose_name='suggested seminars')), + ], options={ 'verbose_name': 'Seminar', diff --git a/teleforma/migrations/0004_forms_builder.py b/teleforma/migrations/0004_forms_builder.py new file mode 100644 index 00000000..01e44a43 --- /dev/null +++ b/teleforma/migrations/0004_forms_builder.py @@ -0,0 +1,33 @@ + +# Generated by Django 3.2.3 on 2022-01-12 17:55 + +from django.db import migrations, models +TARGET_APP = 'forms' # application label migration is for + +class Migration(migrations.Migration): + + def __init__(self, name, app_label): + # overriding application operated upon + super(Migration, self).__init__(name, TARGET_APP) + + # specify what original migration file it replaces + # or leave migration loader confused about unapplied migration + replaces = ((TARGET_APP, __module__.rsplit('.', 1)[-1]),) + + dependencies = [ + ('teleforma', '0003_auto_20220112_1629'), + ] + + + operations = [ + migrations.AddField( + model_name='form', + name='redirect_url', + field=models.CharField(blank=True, help_text='An alternate URL to redirect to after form submission', max_length=200, null=True, verbose_name='Redirect url'), + ), + migrations.AddField( + model_name='form', + name='sites', + field=models.ManyToManyField(default=[1], related_name='forms_form_forms', to='sites.Site'), + ), + ] \ No newline at end of file diff --git a/teleforma/models/pro.py b/teleforma/models/pro.py index 31a309fc..ad6a18bd 100644 --- a/teleforma/models/pro.py +++ b/teleforma/models/pro.py @@ -70,7 +70,7 @@ class Seminar(ClonableMixin, Displayable, ProductCodeMixin, SuggestionsMixin): upcoming = models.BooleanField("A venir (shop)", default=False) type = models.ForeignKey(SeminarType, related_name='seminar', verbose_name=_('type'), blank=True, null=True, on_delete=models.SET_NULL) - period = ForeignKey('Period', related_name='seminar', verbose_name=_('period'), + period = models.ForeignKey('Period', related_name='seminar', verbose_name=_('period'), null=True, blank=True, on_delete=models.SET_NULL) course = models.ForeignKey(Course, related_name='seminar', verbose_name=_('course'), on_delete=models.CASCADE) rank = models.IntegerField(_('rank'), blank=True, null=True)