From c4627d29c535630f130b9b887a4ae97942e340dd Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 3 Mar 2018 14:58:40 +0100 Subject: [PATCH] Update migrations --- ...=> 0008_remove_customuser_is_superuser.py} | 4 +-- ...222_2134.py => 0020_auto_20180303_1355.py} | 29 +++---------------- 2 files changed, 6 insertions(+), 27 deletions(-) rename membership/migrations/{0007_remove_customuser_is_superuser.py => 0008_remove_customuser_is_superuser.py} (75%) rename ungleich_page/migrations/{0018_auto_20171222_2134.py => 0020_auto_20180303_1355.py} (68%) diff --git a/membership/migrations/0007_remove_customuser_is_superuser.py b/membership/migrations/0008_remove_customuser_is_superuser.py similarity index 75% rename from membership/migrations/0007_remove_customuser_is_superuser.py rename to membership/migrations/0008_remove_customuser_is_superuser.py index 00107544..1b4c2ac9 100644 --- a/membership/migrations/0007_remove_customuser_is_superuser.py +++ b/membership/migrations/0008_remove_customuser_is_superuser.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.8 on 2017-12-07 20:54 +# Generated by Django 1.11.8 on 2018-03-03 13:57 from __future__ import unicode_literals from django.db import migrations @@ -8,7 +8,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('membership', '0006_auto_20160526_0445'), + ('membership', '0007_auto_20180213_0128'), ] operations = [ diff --git a/ungleich_page/migrations/0018_auto_20171222_2134.py b/ungleich_page/migrations/0020_auto_20180303_1355.py similarity index 68% rename from ungleich_page/migrations/0018_auto_20171222_2134.py rename to ungleich_page/migrations/0020_auto_20180303_1355.py index 1acaa916..fb03a641 100644 --- a/ungleich_page/migrations/0018_auto_20171222_2134.py +++ b/ungleich_page/migrations/0020_auto_20180303_1355.py @@ -1,16 +1,15 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.8 on 2017-12-22 21:34 +# Generated by Django 1.11.8 on 2018-03-03 13:55 from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion -import filer.fields.file class Migration(migrations.Migration): dependencies = [ - ('ungleich_page', '0017_auto_20171219_1856'), + ('ungleich_page', '0019_merge'), ] operations = [ @@ -45,43 +44,23 @@ class Migration(migrations.Migration): field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='ungleich_page_ungleichcustomeritem', serialize=False, to='cms.CMSPlugin'), ), migrations.AlterField( - model_name='ungleichheader', + model_name='ungleichfooter', name='cmsplugin_ptr', - field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='ungleich_page_ungleichheader', serialize=False, to='cms.CMSPlugin'), - ), - migrations.AlterField( - model_name='ungleichheaderitem', - name='cmsplugin_ptr', - field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='ungleich_page_ungleichheaderitem', serialize=False, to='cms.CMSPlugin'), + field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='ungleich_page_ungleichfooter', serialize=False, to='cms.CMSPlugin'), ), migrations.AlterField( model_name='ungleichheaderwithbackgroundimageslider', name='cmsplugin_ptr', field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='ungleich_page_ungleichheaderwithbackgroundimageslider', serialize=False, to='cms.CMSPlugin'), ), - migrations.AlterField( - model_name='ungleichheaderwithbackgroundimageslideritem', - name='cmsplugin_ptr', - field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='ungleich_page_ungleichheaderwithbackgroundimageslideritem', serialize=False, to='cms.CMSPlugin'), - ), migrations.AlterField( model_name='ungleichheaderwithbackgroundvideoslideritem', name='cmsplugin_ptr', field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='ungleich_page_ungleichheaderwithbackgroundvideoslideritem', serialize=False, to='cms.CMSPlugin'), ), - migrations.AlterField( - model_name='ungleichheaderwithbackgroundvideoslideritem', - name='video', - field=filer.fields.file.FilerFileField(blank=True, help_text='Leaving this blank will make the image as the background.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ungleich_header_item_video', to='filer.File'), - ), migrations.AlterField( model_name='ungleichhtmlonly', name='cmsplugin_ptr', field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='ungleich_page_ungleichhtmlonly', serialize=False, to='cms.CMSPlugin'), ), - migrations.AlterField( - model_name='ungleichsimpleheader', - name='cmsplugin_ptr', - field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='ungleich_page_ungleichsimpleheader', serialize=False, to='cms.CMSPlugin'), - ), ]