Skip to content

Commit

Permalink
Attempt to fix all migrations issues after ba3bd6c has been unsuccessful
Browse files Browse the repository at this point in the history
  • Loading branch information
@martinfilliau
martinfilliau committed Jan 14, 2015
1 parent 34e50e9 commit e623592
Show file tree
Hide file tree
Showing 16 changed files with 141 additions and 414 deletions.
2 changes: 1 addition & 1 deletion talks/api_ox/migrations/0002_auto_20141030_1816.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class Migration(migrations.Migration):

dependencies = [
('events', '0009_auto_20141030_1816'),
('events', '__first__'),
('api_ox', '0001_initial'),
]

Expand Down
164 changes: 128 additions & 36 deletions ...ts/migrations/0001_squashed_0009_merge.py → .../0001_squashed_0019_auto_20150107_1008.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
from __future__ import unicode_literals

from django.db import models, migrations
from django.conf import settings


class Migration(migrations.Migration):

dependencies = [
('contenttypes', '__first__'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('api_ox', '__first__'),
]

Expand All @@ -25,7 +27,7 @@ class Migration(migrations.Migration):
bases=(models.Model,),
),
migrations.CreateModel(
name='Speaker',
name='Person',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('name', models.CharField(max_length=250)),
Expand All @@ -48,52 +50,28 @@ class Migration(migrations.Migration):
('group', models.ForeignKey(to_field='id', blank=True, to='events.EventGroup', null=True)),
('location', models.ForeignKey(to_field='id', blank=True, to='api_ox.Location', null=True)),
('department_organiser', models.ForeignKey(to_field='id', blank=True, to='api_ox.Organisation', null=True)),
('speakers', models.ManyToManyField(to=b'events.Speaker', null=True, blank=True)),
],
options={
},
bases=(models.Model,),
),
migrations.AddField(
model_name='speaker',
name='email_address',
field=models.EmailField(default='example@example.com', max_length=254),
preserve_default=False,
),
migrations.AddField(
model_name='eventgroup',
name='group_type',
field=models.CharField(blank=True, max_length=2, null=True, choices=[(b'SE', b'Seminar Series'), (b'CO', b'Conference')]),
preserve_default=True,
),
migrations.CreateModel(
name='Topic',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('name', models.CharField(unique=True, max_length=250)),
('uri', models.URLField(unique=True, db_index=True)),
],
options={
},
bases=(models.Model,),
),
migrations.CreateModel(
name='TopicItem',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('object_id', models.PositiveIntegerField()),
('content_type', models.ForeignKey(to='contenttypes.ContentType')),
('topic', models.ForeignKey(to='events.Topic')),
],
options={
},
bases=(models.Model,),
),
migrations.AlterField(
model_name='topic',
name='name',
field=models.CharField(max_length=250),
),
migrations.CreateModel(
name='PersonEvent',
fields=[
Expand All @@ -107,10 +85,6 @@ class Migration(migrations.Migration):
},
bases=(models.Model,),
),
migrations.RenameModel(
old_name='Speaker',
new_name='Person',
),
migrations.AddField(
model_name='personevent',
name='person',
Expand All @@ -122,10 +96,6 @@ class Migration(migrations.Migration):
reverse_sql=None,
state_operations=None,
),
migrations.RemoveField(
model_name='event',
name='speakers',
),
migrations.AddField(
model_name='event',
name='person_set',
Expand All @@ -136,11 +106,12 @@ class Migration(migrations.Migration):
model_name='event',
name='group',
field=models.ForeignKey(related_name=b'events', blank=True, to='events.EventGroup', null=True),
preserve_default=True,
),
migrations.AddField(
model_name='event',
name='audience',
field=models.TextField(default=b'oxonly', verbose_name=b'Who can attend', choices=[(b'public', b'Public'), (b'oxonly', b'Members of the University only')]),
field=models.TextField(default=b'oxonly', verbose_name=b'Who can attend', choices=[(b'oxonly', b'Members of the University only'), (b'public', b'Public')]),
preserve_default=True,
),
migrations.AddField(
Expand All @@ -164,7 +135,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='event',
name='special_message',
field=models.TextField(default=b'', help_text=b'Use this for important notices - e.g.: cancellation or a last minute change of venue.', verbose_name=b'Special message', blank=True),
field=models.TextField(default=b'', help_text=b'Use this for important notices - e.g.: cancellation or a last minute change of venue', verbose_name=b'Special message', blank=True),
preserve_default=True,
),
migrations.AddField(
Expand All @@ -177,21 +148,142 @@ class Migration(migrations.Migration):
model_name='event',
name='description',
field=models.TextField(blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='event',
name='title',
field=models.CharField(max_length=250, blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='event',
name='location_details',
field=models.TextField(default=b'', help_text=b'e.g.: room number or accessibility information', verbose_name=b'Additional details', blank=True),
field=models.TextField(default=b'', help_text=b'e.g.: room number or accessibility information', verbose_name=b'Venue details', blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='event',
name='group',
field=models.ForeignKey(related_name=b'events', blank=True, to='events.EventGroup', null=True),
preserve_default=True,
),
migrations.AddField(
model_name='topicitem',
name='uri',
field=models.URLField(default='', db_index=True),
preserve_default=False,
),
migrations.AlterField(
model_name='event',
name='department_organiser',
field=models.TextField(default=b'', blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='event',
name='location',
field=models.TextField(blank=True),
preserve_default=True,
),
migrations.AlterUniqueTogether(
name='topicitem',
unique_together=set([('uri', 'content_type', 'object_id')]),
),
migrations.AlterField(
model_name='event',
name='end',
field=models.DateTimeField(),
preserve_default=True,
),
migrations.AlterField(
model_name='event',
name='start',
field=models.DateTimeField(),
preserve_default=True,
),
migrations.AddField(
model_name='event',
name='embargo',
field=models.BooleanField(default=False, verbose_name=b'Embargo'),
preserve_default=True,
),
migrations.AddField(
model_name='event',
name='status',
field=models.TextField(default=b'preparation', verbose_name=b'Status', choices=[(b'preparation', b'In preparation'), (b'published', b'Published')]),
preserve_default=True,
),
migrations.AddField(
model_name='event',
name='editor_set',
field=models.ManyToManyField(to=settings.AUTH_USER_MODEL, blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='eventgroup',
name='department_organiser',
field=models.TextField(default=b'', verbose_name=b'Organising Department', blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='eventgroup',
name='occurence',
field=models.TextField(default=b'', help_text=b'e.g.: Mondays at 10 or September 19th to 20th.', verbose_name=b'Timing', blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='eventgroup',
name='web_address',
field=models.URLField(default=b'', verbose_name=b'Web address', blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='personevent',
name='role',
field=models.TextField(default=b'speaker', choices=[(b'speaker', b'Speaker'), (b'host', b'Host'), (b'organiser', b'Organiser')]),
preserve_default=True,
),
migrations.AlterField(
model_name='eventgroup',
name='description',
field=models.TextField(blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='eventgroup',
name='group_type',
field=models.CharField(default=b'SE', max_length=2, null=True, blank=True, choices=[(b'SE', b'Seminar Series'), (b'CO', b'Conference')]),
preserve_default=True,
),
migrations.AlterField(
model_name='person',
name='bio',
field=models.TextField(verbose_name=b'Affiliation'),
preserve_default=True,
),
migrations.AlterField(
model_name='person',
name='email_address',
field=models.EmailField(max_length=254, null=True, blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='event',
name='booking_email',
field=models.EmailField(default=b'', max_length=75, verbose_name=b'Email address for booking', blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='event',
name='organiser_email',
field=models.EmailField(default=b'', max_length=75, verbose_name=b'Organiser contact email', blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='eventgroup',
name='organisers',
field=models.ManyToManyField(to=b'events.Person', null=True, blank=True),
preserve_default=True,
),
]
41 changes: 0 additions & 41 deletions talks/events/migrations/0009_auto_20141030_1816.py
View file

This file was deleted.

26 changes: 0 additions & 26 deletions talks/events/migrations/0010_auto_20141031_1547.py
View file

This file was deleted.

24 changes: 0 additions & 24 deletions talks/events/migrations/0010_auto_20141031_1722.py
View file

This file was deleted.

15 changes: 0 additions & 15 deletions talks/events/migrations/0011_merge.py
View file

This file was deleted.

0 comments on commit e623592

Please sign in to comment.