diff --git a/src/tickets/migrations/0002_auto_20170817_1937.py b/src/tickets/migrations/0002_auto_20170817_1937.py deleted file mode 100644 index 4432e465..00000000 --- a/src/tickets/migrations/0002_auto_20170817_1937.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.5 on 2017-08-17 17:37 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('camps', '0022_camp_colour'), - ('tickets', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='baseticket', - name='camp', - ), - migrations.AddField( - model_name='tickettype', - name='camp', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='camps.Camp'), - ), - ] diff --git a/src/tickets/migrations/0005_auto_20170819_2109.py b/src/tickets/migrations/0002_auto_20170819_2126.py similarity index 80% rename from src/tickets/migrations/0005_auto_20170819_2109.py rename to src/tickets/migrations/0002_auto_20170819_2126.py index fd6eb307..ccebdb12 100644 --- a/src/tickets/migrations/0005_auto_20170819_2109.py +++ b/src/tickets/migrations/0002_auto_20170819_2126.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10.5 on 2017-08-19 19:09 +# Generated by Django 1.10.5 on 2017-08-19 19:26 from __future__ import unicode_literals from django.db import migrations, models @@ -11,10 +11,15 @@ import uuid class Migration(migrations.Migration): dependencies = [ - ('tickets', '0004_auto_20170818_1303'), + ('camps', '0022_camp_colour'), + ('tickets', '0001_initial'), ] operations = [ + migrations.RemoveField( + model_name='baseticket', + name='camp', + ), migrations.RemoveField( model_name='baseticket', name='id', @@ -31,6 +36,10 @@ class Migration(migrations.Migration): model_name='discountticket', name='uuid', ), + migrations.RemoveField( + model_name='shopticket', + name='checked_in', + ), migrations.RemoveField( model_name='shopticket', name='created', @@ -55,6 +64,11 @@ class Migration(migrations.Migration): model_name='sponsorticket', name='uuid', ), + migrations.AddField( + model_name='baseticket', + name='checked_in', + field=models.BooleanField(default=False), + ), migrations.AddField( model_name='baseticket', name='created', @@ -71,6 +85,11 @@ class Migration(migrations.Migration): name='uuid', field=models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False), ), + migrations.AddField( + model_name='tickettype', + name='camp', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='camps.Camp'), + ), migrations.AlterField( model_name='discountticket', name='baseticket_ptr', diff --git a/src/tickets/migrations/0003_auto_20170817_1938.py b/src/tickets/migrations/0003_auto_20170819_2126.py similarity index 81% rename from src/tickets/migrations/0003_auto_20170817_1938.py rename to src/tickets/migrations/0003_auto_20170819_2126.py index 0156481e..6b1bad2e 100644 --- a/src/tickets/migrations/0003_auto_20170817_1938.py +++ b/src/tickets/migrations/0003_auto_20170819_2126.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10.5 on 2017-08-17 17:38 +# Generated by Django 1.10.5 on 2017-08-19 19:26 from __future__ import unicode_literals from django.db import migrations, models @@ -9,7 +9,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('tickets', '0002_auto_20170817_1937'), + ('tickets', '0002_auto_20170819_2126'), ] operations = [ diff --git a/src/tickets/migrations/0004_auto_20170818_1303.py b/src/tickets/migrations/0004_auto_20170818_1303.py deleted file mode 100644 index cd3ff42a..00000000 --- a/src/tickets/migrations/0004_auto_20170818_1303.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.5 on 2017-08-18 11:03 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('tickets', '0003_auto_20170817_1938'), - ] - - operations = [ - migrations.RemoveField( - model_name='shopticket', - name='checked_in', - ), - migrations.AddField( - model_name='baseticket', - name='checked_in', - field=models.BooleanField(default=False), - ), - ]