diff --git a/accounts/migrations/0001_initial.py b/accounts/migrations/0001_initial.py index 8fe7f8d..36a5856 100644 --- a/accounts/migrations/0001_initial.py +++ b/accounts/migrations/0001_initial.py @@ -1,13 +1,11 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-09 16:33 +# Generated by Django 1.10.3 on 2017-01-13 10:49 from __future__ import unicode_literals import accounts.utils from django.conf import settings -import django.contrib.sites.managers from django.db import migrations, models import django.db.models.deletion -import django.db.models.manager class Migration(migrations.Migration): @@ -20,25 +18,46 @@ class Migration(migrations.Migration): ] operations = [ + migrations.CreateModel( + name='AvailabilityTimeslot', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('start', models.DateTimeField(blank=True)), + ('end', models.DateTimeField(blank=True)), + ], + ), + migrations.CreateModel( + name='Connector', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=64, unique=True)), + ], + options={ + 'abstract': False, + }, + ), migrations.CreateModel( name='Participation', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('created', models.DateTimeField(auto_now_add=True)), ('updated', models.DateTimeField(auto_now=True)), + ('need_transport', models.NullBooleanField(default=None, verbose_name='Defray transportation?')), ('arrival', models.DateTimeField(blank=True, null=True)), ('departure', models.DateTimeField(blank=True, null=True)), - ('transport', models.IntegerField(blank=True, choices=[(1, 'train'), (2, 'plane'), (3, 'others')], null=True)), - ('connector', models.IntegerField(blank=True, choices=[(1, 'VGA'), (2, 'HDMI'), (3, 'miniDP')], null=True)), - ('constraints', models.TextField(blank=True)), + ('transport_city_outward', models.CharField(blank=True, default='', max_length=256, verbose_name='Departure city')), + ('transport_city_return', models.CharField(blank=True, default='', help_text='If different from departure city', max_length=256, verbose_name='Return city')), + ('transport_booked', models.BooleanField(default=False)), + ('accommodation', models.IntegerField(blank=True, choices=[(0, 'No'), (1, 'Hotel'), (2, 'Homestay')], null=True, verbose_name='Need accommodation?')), + ('accommodation_booked', models.BooleanField(default=False)), + ('constraints', models.TextField(blank=True, verbose_name='Constraints')), ('sound', models.BooleanField(default=False, verbose_name='I need sound')), + ('videotaped', models.BooleanField(default=True, verbose_name="I'm ok to be recorded on video")), + ('video_licence', models.IntegerField(choices=[(1, 'CC-Zero'), (2, 'CC-BY'), (3, 'CC-BY-SA'), (4, 'CC-BY-ND'), (5, 'CC-BY-NC'), (6, 'CC-BY-NC-SA'), (7, 'CC-BY-NC-ND')], default=2, verbose_name='Video licence')), + ('notes', models.TextField(blank=True, default='', help_text='This field is only visible by organizers.', verbose_name='Notes')), ('orga', models.BooleanField(default=False)), + ('connector', models.ManyToManyField(blank=True, to='accounts.Connector', verbose_name='I can output')), ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - managers=[ - ('objects', django.db.models.manager.Manager()), - ('on_site', django.contrib.sites.managers.CurrentSiteManager()), ], ), migrations.CreateModel( @@ -47,15 +66,40 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('created', models.DateTimeField(auto_now_add=True)), ('updated', models.DateTimeField(auto_now=True)), + ('phone_number', models.CharField(blank=True, default='', max_length=16, verbose_name='Phone number')), ('biography', models.TextField(blank=True, verbose_name='Biography')), ('email_token', models.CharField(default=accounts.utils.generate_user_uid, max_length=12, unique=True)), - ('notes', models.TextField(default='')), ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], options={ 'abstract': False, }, ), + migrations.CreateModel( + name='Transport', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=64, unique=True)), + ], + options={ + 'abstract': False, + }, + ), + migrations.AddField( + model_name='participation', + name='transport', + field=models.ManyToManyField(blank=True, to='accounts.Transport', verbose_name='I want to travel by'), + ), + migrations.AddField( + model_name='participation', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + migrations.AddField( + model_name='availabilitytimeslot', + name='participation', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='availabilities', to='accounts.Participation'), + ), migrations.AlterUniqueTogether( name='participation', unique_together=set([('site', 'user')]), diff --git a/accounts/migrations/0002_auto_20160709_2059.py b/accounts/migrations/0002_auto_20160709_2059.py deleted file mode 100644 index 0673531..0000000 --- a/accounts/migrations/0002_auto_20160709_2059.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-09 20:59 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0001_initial'), - ] - - operations = [ - migrations.AlterModelManagers( - name='participation', - managers=[ - ], - ), - ] diff --git a/accounts/migrations/0003_auto_20160709_2240.py b/accounts/migrations/0003_auto_20160709_2240.py deleted file mode 100644 index 47328d9..0000000 --- a/accounts/migrations/0003_auto_20160709_2240.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-09 22:40 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0002_auto_20160709_2059'), - ] - - operations = [ - migrations.AddField( - model_name='participation', - name='video_licence', - field=models.IntegerField(choices=[(1, 'CC-Zero'), (2, 'CC-BY'), (3, 'CC-BY-SA'), (4, 'CC-BY-ND'), (5, 'CC-BY-NC'), (6, 'CC-BY-NC-SA'), (7, 'CC-BY-NC-ND')], default=1), - ), - migrations.AddField( - model_name='participation', - name='videotaped', - field=models.BooleanField(default=True, verbose_name="I'm ok to be recorded on video"), - ), - ] diff --git a/accounts/migrations/0004_auto_20160710_2011.py b/accounts/migrations/0004_auto_20160710_2011.py deleted file mode 100644 index f5bfe01..0000000 --- a/accounts/migrations/0004_auto_20160710_2011.py +++ /dev/null @@ -1,53 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-10 20:11 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0003_auto_20160709_2240'), - ] - - operations = [ - migrations.CreateModel( - name='Connector', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=64, unique=True)), - ], - options={ - 'abstract': False, - }, - ), - migrations.CreateModel( - name='Transport', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=64, unique=True)), - ], - options={ - 'abstract': False, - }, - ), - migrations.RemoveField( - model_name='participation', - name='connector', - ), - migrations.RemoveField( - model_name='participation', - name='transport', - ), - migrations.AddField( - model_name='participation', - name='connector', - field=models.ManyToManyField(blank=True, to='accounts.Connector', verbose_name='I can output'), - ), - migrations.AddField( - model_name='participation', - name='transport', - field=models.ManyToManyField(blank=True, to='accounts.Transport', verbose_name="I'm ok to travel by"), - ), - ] diff --git a/accounts/migrations/0005_auto_20160712_1204.py b/accounts/migrations/0005_auto_20160712_1204.py deleted file mode 100644 index 07dd063..0000000 --- a/accounts/migrations/0005_auto_20160712_1204.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-12 12:04 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0004_auto_20160710_2011'), - ] - - operations = [ - migrations.RemoveField( - model_name='profile', - name='notes', - ), - migrations.AddField( - model_name='participation', - name='notes', - field=models.TextField(blank=True, default=''), - ), - ] diff --git a/accounts/migrations/0006_auto_20160723_1216.py b/accounts/migrations/0006_auto_20160723_1216.py deleted file mode 100644 index ab04501..0000000 --- a/accounts/migrations/0006_auto_20160723_1216.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-23 12:16 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0005_auto_20160712_1204'), - ] - - operations = [ - migrations.AlterField( - model_name='participation', - name='notes', - field=models.TextField(blank=True, default='', verbose_name='Notes'), - ), - migrations.AlterField( - model_name='participation', - name='video_licence', - field=models.IntegerField(choices=[(1, 'CC-Zero'), (2, 'CC-BY'), (3, 'CC-BY-SA'), (4, 'CC-BY-ND'), (5, 'CC-BY-NC'), (6, 'CC-BY-NC-SA'), (7, 'CC-BY-NC-ND')], default=1, verbose_name='Video licence'), - ), - ] diff --git a/accounts/migrations/0007_auto_20160808_2145.py b/accounts/migrations/0007_auto_20160808_2145.py deleted file mode 100644 index 4332c45..0000000 --- a/accounts/migrations/0007_auto_20160808_2145.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-08 21:45 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0006_auto_20160723_1216'), - ] - - operations = [ - migrations.AlterField( - model_name='participation', - name='constraints', - field=models.TextField(blank=True, verbose_name='Constraints'), - ), - ] diff --git a/accounts/migrations/0008_auto_20160808_2251.py b/accounts/migrations/0008_auto_20160808_2251.py deleted file mode 100644 index ff5e07d..0000000 --- a/accounts/migrations/0008_auto_20160808_2251.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-08 22:51 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0007_auto_20160808_2145'), - ] - - operations = [ - migrations.AddField( - model_name='participation', - name='homestay', - field=models.BooleanField(default=False, verbose_name='Ok for homestay?'), - ), - migrations.AddField( - model_name='participation', - name='need_hosting', - field=models.BooleanField(default=False, verbose_name='Need hosting?'), - ), - migrations.AddField( - model_name='participation', - name='need_transport', - field=models.BooleanField(default=False, verbose_name='Need transport?'), - ), - ] diff --git a/accounts/migrations/0009_auto_20160921_2236.py b/accounts/migrations/0009_auto_20160921_2236.py deleted file mode 100644 index 372dbf4..0000000 --- a/accounts/migrations/0009_auto_20160921_2236.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-21 22:36 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0008_auto_20160808_2251'), - ] - - operations = [ - migrations.AlterField( - model_name='participation', - name='video_licence', - field=models.IntegerField(choices=[(1, 'CC-Zero'), (2, 'CC-BY'), (3, 'CC-BY-SA'), (4, 'CC-BY-ND'), (5, 'CC-BY-NC'), (6, 'CC-BY-NC-SA'), (7, 'CC-BY-NC-ND')], default=2, verbose_name='Video licence'), - ), - ] diff --git a/accounts/migrations/0010_auto_20161003_1152.py b/accounts/migrations/0010_auto_20161003_1152.py deleted file mode 100644 index 6ef72bc..0000000 --- a/accounts/migrations/0010_auto_20161003_1152.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-10-03 11:52 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0009_auto_20160921_2236'), - ] - - operations = [ - migrations.AddField( - model_name='participation', - name='hosting_booked', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='participation', - name='transport_booked', - field=models.BooleanField(default=False), - ), - ] diff --git a/accounts/migrations/0011_auto_20161005_1841.py b/accounts/migrations/0011_auto_20161005_1841.py deleted file mode 100644 index e9bc300..0000000 --- a/accounts/migrations/0011_auto_20161005_1841.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-05 18:41 -from __future__ import unicode_literals - -from django.db import migrations, models - - -def transport_false_to_none(apps, schema_editor): - db_alias = schema_editor.connection.alias - Participation = apps.get_model('accounts', 'Participation') - for participation in Participation.objects.using(db_alias).all(): - if participation.need_transport == False: - participation.need_transport = None - participation.save() - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0010_auto_20161003_1152'), - ] - - operations = [ - migrations.AlterField( - model_name='participation', - name='need_transport', - field=models.NullBooleanField(default=None, verbose_name='Need transport?'), - ), - migrations.RunPython(transport_false_to_none), - migrations.AlterField( - model_name='participation', - name='notes', - field=models.TextField(blank=True, default='', help_text='This field is only visible by organizers.', verbose_name='Notes'), - ), - ] diff --git a/accounts/migrations/0012_auto_20161006_1853.py b/accounts/migrations/0012_auto_20161006_1853.py deleted file mode 100644 index ca8c7ca..0000000 --- a/accounts/migrations/0012_auto_20161006_1853.py +++ /dev/null @@ -1,46 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-10-06 18:53 -from __future__ import unicode_literals - -from django.db import migrations, models - - -def migrate_accommodations(apps, schema_editor): - db_alias = schema_editor.connection.alias - Participation = apps.get_model('accounts', 'Participation') - for participation in Participation.objects.using(db_alias).all(): - if participation.need_hosting: - if participation.homestay: - participation.accommodation = 2 - else: - participation.accommodation = 1 - participation.save() - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0011_auto_20161005_1841'), - ] - - operations = [ - migrations.RenameField( - model_name='participation', - old_name='hosting_booked', - new_name='accommodation_booked', - ), - migrations.AddField( - model_name='participation', - name='accommodation', - field=models.IntegerField(null=True, blank=True, choices=[(0, 'No'), (1, 'Hotel'), (2, 'Homestay')], verbose_name='Need accommodation?'), - ), - migrations.RunPython(migrate_accommodations), - migrations.RemoveField( - model_name='participation', - name='need_hosting', - ), - migrations.RemoveField( - model_name='participation', - name='homestay', - ), - ] diff --git a/accounts/migrations/0013_availabilitytimeslot.py b/accounts/migrations/0013_availabilitytimeslot.py deleted file mode 100644 index ab8eee7..0000000 --- a/accounts/migrations/0013_availabilitytimeslot.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-10 21:08 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0012_auto_20161006_1853'), - ] - - operations = [ - migrations.CreateModel( - name='AvailabilityTimeslot', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start', models.DateTimeField(blank=True)), - ('end', models.DateTimeField(blank=True)), - ('participation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='availabilities', to='accounts.Participation')), - ], - ), - ] diff --git a/accounts/migrations/0014_auto_20161013_1822.py b/accounts/migrations/0014_auto_20161013_1822.py deleted file mode 100644 index a6179c2..0000000 --- a/accounts/migrations/0014_auto_20161013_1822.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-13 18:22 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0013_availabilitytimeslot'), - ] - - operations = [ - migrations.AddField( - model_name='participation', - name='transport_city_outward', - field=models.CharField(blank=True, default='', max_length=256, verbose_name='Departure city'), - ), - migrations.AddField( - model_name='participation', - name='transport_city_return', - field=models.CharField(blank=True, default='', help_text='If different from departure city', max_length=256, verbose_name='Return city'), - ), - ] diff --git a/accounts/migrations/0015_auto_20161013_1922.py b/accounts/migrations/0015_auto_20161013_1922.py deleted file mode 100644 index edcb6a1..0000000 --- a/accounts/migrations/0015_auto_20161013_1922.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-13 19:22 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0014_auto_20161013_1822'), - ] - - operations = [ - migrations.AlterField( - model_name='participation', - name='need_transport', - field=models.NullBooleanField(default=None, verbose_name='Defray transportation?'), - ), - migrations.AlterField( - model_name='participation', - name='transport', - field=models.ManyToManyField(blank=True, to='accounts.Transport', verbose_name='I want to travel by'), - ), - ] diff --git a/accounts/migrations/0016_profile_phone_number.py b/accounts/migrations/0016_profile_phone_number.py deleted file mode 100644 index 463a400..0000000 --- a/accounts/migrations/0016_profile_phone_number.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-13 19:08 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0015_auto_20161013_1922'), - ] - - operations = [ - migrations.AddField( - model_name='profile', - name='phone_number', - field=models.CharField(blank=True, default='', max_length=16, verbose_name='Phone number'), - ), - ] diff --git a/conversations/migrations/0001_initial.py b/conversations/migrations/0001_initial.py index cb165bc..2784369 100644 --- a/conversations/migrations/0001_initial.py +++ b/conversations/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-09 16:42 +# Generated by Django 1.10.3 on 2017-01-13 10:49 from __future__ import unicode_literals import conversations.utils @@ -13,10 +13,9 @@ class Migration(migrations.Migration): initial = True dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('contenttypes', '0002_remove_content_type_name'), ('accounts', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('proposals', '0001_initial'), ] operations = [ @@ -27,7 +26,6 @@ class Migration(migrations.Migration): ('created', models.DateTimeField(auto_now_add=True)), ('updated', models.DateTimeField(auto_now=True)), ('subscribers', models.ManyToManyField(blank=True, related_name='_conversationabouttalk_subscribers_+', to=settings.AUTH_USER_MODEL)), - ('talk', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='conversation', to='proposals.Talk')), ], options={ 'abstract': False, @@ -54,7 +52,7 @@ class Migration(migrations.Migration): ('updated', models.DateTimeField(auto_now=True)), ('object_id', models.PositiveIntegerField()), ('token', models.CharField(default=conversations.utils.generate_message_token, max_length=64, unique=True)), - ('content', models.TextField()), + ('content', models.TextField(blank=True)), ('system', models.BooleanField(default=False)), ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), diff --git a/conversations/migrations/0002_auto_20161002_2222.py b/conversations/migrations/0002_auto_20161002_2222.py deleted file mode 100644 index cb5598c..0000000 --- a/conversations/migrations/0002_auto_20161002_2222.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.2 on 2016-10-02 22:22 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('conversations', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='message', - name='content', - field=models.TextField(blank=True), - ), - ] diff --git a/conversations/migrations/0002_conversationabouttalk_talk.py b/conversations/migrations/0002_conversationabouttalk_talk.py new file mode 100644 index 0000000..ddaa634 --- /dev/null +++ b/conversations/migrations/0002_conversationabouttalk_talk.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2017-01-13 10:49 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('proposals', '0001_initial'), + ('conversations', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='conversationabouttalk', + name='talk', + field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='conversation', to='proposals.Talk'), + ), + ] diff --git a/planning/migrations/0001_initial.py b/planning/migrations/0001_initial.py index 22b961c..fff5ab1 100644 --- a/planning/migrations/0001_initial.py +++ b/planning/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-05 20:53 +# Generated by Django 1.10.3 on 2017-01-13 10:49 from __future__ import unicode_literals import autoslug.fields @@ -11,16 +11,24 @@ class Migration(migrations.Migration): initial = True + dependencies = [ + ('sites', '0002_alter_domain_unique'), + ] + operations = [ migrations.CreateModel( name='Room', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.TextField(blank=True, default='')), - ('capacity', models.IntegerField(default=0)), - ('site', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), + ('name', models.CharField(blank=True, default='', max_length=256)), + ('label', models.CharField(blank=True, default='', max_length=256)), + ('capacity', models.IntegerField(default=0)), + ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), ], + options={ + 'ordering': ['name'], + }, ), migrations.AlterUniqueTogether( name='room', diff --git a/planning/migrations/0002_auto_20161005_2108.py b/planning/migrations/0002_auto_20161005_2108.py deleted file mode 100644 index 4c62edf..0000000 --- a/planning/migrations/0002_auto_20161005_2108.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-05 21:08 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('planning', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='room', - name='name', - field=models.CharField(blank=True, default='', max_length=256), - ), - migrations.AlterField( - model_name='room', - name='site', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site'), - ), - ] diff --git a/planning/migrations/0003_room_label.py b/planning/migrations/0003_room_label.py deleted file mode 100644 index 0b6fbcf..0000000 --- a/planning/migrations/0003_room_label.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-10 22:06 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('planning', '0002_auto_20161005_2108'), - ] - - operations = [ - migrations.AddField( - model_name='room', - name='label', - field=models.CharField(blank=True, default='', max_length=256), - ), - ] diff --git a/planning/migrations/0004_auto_20161013_1645.py b/planning/migrations/0004_auto_20161013_1645.py deleted file mode 100644 index ed954c7..0000000 --- a/planning/migrations/0004_auto_20161013_1645.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-13 16:45 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('planning', '0003_room_label'), - ] - - operations = [ - migrations.AlterModelOptions( - name='room', - options={'ordering': ['name']}, - ), - ] diff --git a/proposals/migrations/0001_initial.py b/proposals/migrations/0001_initial.py index ce4746e..8cb8222 100644 --- a/proposals/migrations/0001_initial.py +++ b/proposals/migrations/0001_initial.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-09 16:33 +# Generated by Django 1.10.3 on 2017-01-13 10:49 from __future__ import unicode_literals import autoslug.fields +import colorful.fields from django.conf import settings -import django.contrib.sites.managers import django.core.validators from django.db import migrations, models import django.db.models.deletion -import django.db.models.manager +import proposals.models class Migration(migrations.Migration): @@ -17,33 +17,80 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('accounts', '0001_initial'), + ('planning', '0001_initial'), ('sites', '0002_alter_domain_unique'), ] operations = [ + migrations.CreateModel( + name='Attendee', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateTimeField(auto_now_add=True)), + ('updated', models.DateTimeField(auto_now=True)), + ('name', models.CharField(blank=True, default='', max_length=64)), + ('email', models.EmailField(blank=True, default='', max_length=254)), + ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Conference', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('home', models.TextField(blank=True, default='')), + ('venue', models.TextField(blank=True, default='')), + ('city', models.CharField(blank=True, default='', max_length=64)), + ('subscriptions_open', models.BooleanField(default=False)), + ('site', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), + ], + ), + migrations.CreateModel( + name='Event', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=64)), + ('duration', models.PositiveIntegerField(default=0, verbose_name='Default duration (min)')), + ('color', colorful.fields.RGBColorField(default='#ffffff', verbose_name='Color on program')), + ('label', models.CharField(blank=True, default='', max_length=64, verbose_name='Label on program')), + ('opening_date', models.DateTimeField(blank=True, default=None, null=True)), + ('closing_date', models.DateTimeField(blank=True, default=None, null=True)), + ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), + ], + options={ + 'ordering': ('pk',), + }, + ), migrations.CreateModel( name='Talk', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('created', models.DateTimeField(auto_now_add=True)), ('updated', models.DateTimeField(auto_now=True)), - ('title', models.CharField(max_length=128, verbose_name='Title')), + ('title', models.CharField(help_text='After submission, title can only be changed by the staff.', max_length=128, verbose_name='Title')), ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='title', unique=True)), + ('abstract', models.CharField(blank=True, max_length=255, verbose_name='Abstract')), ('description', models.TextField(blank=True, verbose_name='Description')), - ('event', models.IntegerField(choices=[(1, 'conference short'), (2, 'conference long'), (3, 'workshop'), (4, 'stand'), (5, 'other')], default=1)), + ('notes', models.TextField(blank=True, verbose_name='Notes')), ('accepted', models.NullBooleanField(default=None)), + ('start_date', models.DateTimeField(blank=True, default=None, null=True)), + ('duration', models.PositiveIntegerField(default=0, verbose_name='Duration (min)')), + ('plenary', models.BooleanField(default=False)), + ('registration_required', models.BooleanField(default=False)), + ('attendees_limit', models.PositiveIntegerField(default=0, verbose_name='Max. number of attendees')), + ('materials', models.FileField(help_text='You can use this field to share some materials related to your intervention.', null=True, upload_to=proposals.models.talk_materials_destination, verbose_name='Materials')), + ('attendees', models.ManyToManyField(to='proposals.Attendee', verbose_name='Attendees')), + ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='proposals.Event', verbose_name='Intervention kind')), ('proposer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL)), + ('room', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='planning.Room')), ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), - ('speakers', models.ManyToManyField(to=settings.AUTH_USER_MODEL)), + ('speakers', models.ManyToManyField(to=settings.AUTH_USER_MODEL, verbose_name='Speakers')), ], options={ - 'abstract': False, + 'ordering': ('event__id',), }, - managers=[ - ('objects', django.db.models.manager.Manager()), - ('on_site', django.contrib.sites.managers.CurrentSiteManager()), - ], ), migrations.CreateModel( name='Topic', @@ -51,17 +98,24 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('created', models.DateTimeField(auto_now_add=True)), ('updated', models.DateTimeField(auto_now=True)), - ('name', models.CharField(max_length=128, unique=True, verbose_name='Name')), + ('name', models.CharField(max_length=128, verbose_name='Name')), ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True)), - ('reviewers', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL)), + ('description', models.TextField(blank=True, verbose_name='Description')), + ('reviewers', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL, verbose_name='Reviewers')), ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), ], - options={ - 'abstract': False, - }, - managers=[ - ('objects', django.db.models.manager.Manager()), - ('on_site', django.contrib.sites.managers.CurrentSiteManager()), + ), + migrations.CreateModel( + name='Track', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateTimeField(auto_now_add=True)), + ('updated', models.DateTimeField(auto_now=True)), + ('name', models.CharField(max_length=128, verbose_name='Name')), + ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), + ('description', models.TextField(blank=True, verbose_name='Description')), + ('managers', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL, verbose_name='Managers')), + ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), ], ), migrations.CreateModel( @@ -72,16 +126,38 @@ class Migration(migrations.Migration): ('updated', models.DateTimeField(auto_now=True)), ('vote', models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(-2), django.core.validators.MaxValueValidator(2)])), ('talk', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='proposals.Talk')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='accounts.Participation')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), + migrations.AddField( + model_name='topic', + name='track', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='proposals.Track', verbose_name='Destination track'), + ), migrations.AddField( model_name='talk', name='topics', - field=models.ManyToManyField(blank=True, to='proposals.Topic'), + field=models.ManyToManyField(blank=True, help_text='The topics can not be changed after submission.', to='proposals.Topic', verbose_name='Topics'), + ), + migrations.AddField( + model_name='talk', + name='track', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='proposals.Track', verbose_name='Track'), ), migrations.AlterUniqueTogether( name='vote', unique_together=set([('talk', 'user')]), ), + migrations.AlterUniqueTogether( + name='track', + unique_together=set([('site', 'name')]), + ), + migrations.AlterUniqueTogether( + name='topic', + unique_together=set([('site', 'name')]), + ), + migrations.AlterUniqueTogether( + name='event', + unique_together=set([('site', 'name')]), + ), ] diff --git a/proposals/migrations/0002_auto_20160709_2059.py b/proposals/migrations/0002_auto_20160709_2059.py deleted file mode 100644 index 4c12030..0000000 --- a/proposals/migrations/0002_auto_20160709_2059.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-09 20:59 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0001_initial'), - ] - - operations = [ - migrations.AlterModelManagers( - name='talk', - managers=[ - ], - ), - migrations.AlterModelManagers( - name='topic', - managers=[ - ], - ), - ] diff --git a/proposals/migrations/0003_auto_20160711_1933.py b/proposals/migrations/0003_auto_20160711_1933.py deleted file mode 100644 index 266567f..0000000 --- a/proposals/migrations/0003_auto_20160711_1933.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-11 19:33 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0002_auto_20160709_2059'), - ] - - operations = [ - migrations.AlterField( - model_name='vote', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/proposals/migrations/0004_auto_20160711_2058.py b/proposals/migrations/0004_auto_20160711_2058.py deleted file mode 100644 index 3fcf144..0000000 --- a/proposals/migrations/0004_auto_20160711_2058.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-11 20:58 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0003_auto_20160711_1933'), - ] - - operations = [ - migrations.AlterField( - model_name='topic', - name='name', - field=models.CharField(max_length=128, verbose_name='Name'), - ), - migrations.AlterUniqueTogether( - name='topic', - unique_together=set([('site', 'name')]), - ), - ] diff --git a/proposals/migrations/0005_auto_20160723_1216.py b/proposals/migrations/0005_auto_20160723_1216.py deleted file mode 100644 index 4664c27..0000000 --- a/proposals/migrations/0005_auto_20160723_1216.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-23 12:16 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0004_auto_20160711_2058'), - ] - - operations = [ - migrations.AlterField( - model_name='talk', - name='event', - field=models.IntegerField(choices=[(1, 'conference short'), (2, 'conference long'), (3, 'workshop'), (4, 'stand'), (5, 'other')], default=1, verbose_name='Format'), - ), - migrations.AlterField( - model_name='talk', - name='speakers', - field=models.ManyToManyField(to=settings.AUTH_USER_MODEL, verbose_name='Speakers'), - ), - migrations.AlterField( - model_name='talk', - name='topics', - field=models.ManyToManyField(blank=True, to='proposals.Topic', verbose_name='Topics'), - ), - migrations.AlterField( - model_name='topic', - name='reviewers', - field=models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL, verbose_name='Reviewers'), - ), - ] diff --git a/proposals/migrations/0006_topic_description.py b/proposals/migrations/0006_topic_description.py deleted file mode 100644 index 5542d7a..0000000 --- a/proposals/migrations/0006_topic_description.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-07 07:50 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0005_auto_20160723_1216'), - ] - - operations = [ - migrations.AddField( - model_name='topic', - name='description', - field=models.TextField(blank=True, verbose_name='Description'), - ), - ] diff --git a/proposals/migrations/0007_conference.py b/proposals/migrations/0007_conference.py deleted file mode 100644 index 7d01461..0000000 --- a/proposals/migrations/0007_conference.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-07 10:45 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('sites', '0002_alter_domain_unique'), - ('proposals', '0006_topic_description'), - ] - - operations = [ - migrations.CreateModel( - name='Conference', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('home', models.TextField(blank=True, default='')), - ('site', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), - ], - ), - ] diff --git a/proposals/migrations/0008_auto_20160808_2145.py b/proposals/migrations/0008_auto_20160808_2145.py deleted file mode 100644 index c9819c9..0000000 --- a/proposals/migrations/0008_auto_20160808_2145.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-08 21:45 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0007_conference'), - ] - - operations = [ - migrations.AddField( - model_name='talk', - name='abstract', - field=models.CharField(blank=True, max_length=255, verbose_name='Abstract'), - ), - migrations.AddField( - model_name='talk', - name='notes', - field=models.TextField(blank=True, verbose_name='Notes'), - ), - ] diff --git a/proposals/migrations/0009_auto_20160822_0921.py b/proposals/migrations/0009_auto_20160822_0921.py deleted file mode 100644 index a68e094..0000000 --- a/proposals/migrations/0009_auto_20160822_0921.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-22 09:21 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0008_auto_20160808_2145'), - ] - - operations = [ - migrations.AlterModelOptions( - name='talk', - options={'ordering': ('event',)}, - ), - ] diff --git a/proposals/migrations/0010_auto_20160822_1010.py b/proposals/migrations/0010_auto_20160822_1010.py deleted file mode 100644 index 10a8bc7..0000000 --- a/proposals/migrations/0010_auto_20160822_1010.py +++ /dev/null @@ -1,87 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-22 10:10 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -def migrate_event(apps, schema_editor): - db_alias = schema_editor.connection.alias - # Create default Event instance, as Site post_save is not triggered - Event = apps.get_model('proposals', 'Event') - Site = apps.get_model('sites', 'Site') - for site in Site.objects.using(db_alias).all(): - Event.objects.using(db_alias).bulk_create([ - Event(site=site, name='conference (short)'), - Event(site=site, name='conference (long)'), - Event(site=site, name='workshop'), - Event(site=site, name='stand'), - Event(site=site, name='other'), - ]) - # Migrate event_old field to event field - Talk = apps.get_model('proposals', 'Talk') - mapping = { - 1: 'conference (short)', - 2: 'conference (long)', - 3: 'workshop', - 4: 'stand', - 5: 'other', - } - for talk in Talk.objects.using(db_alias).all(): - talk.event = Event.objects.using(db_alias).get(site=talk.site, name=mapping[talk.event_old]) - talk.save() - - -class Migration(migrations.Migration): - - dependencies = [ - ('sites', '0002_alter_domain_unique'), - ('proposals', '0009_auto_20160822_0921'), - ] - - operations = [ - # Creation Event model - migrations.CreateModel( - name='Event', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=64)), - ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), - ], - ), - migrations.AlterUniqueTogether( - name='event', - unique_together=set([('site', 'name')]), - ), - # Move field event to event_old - migrations.RenameField( - model_name='talk', - old_name='event', - new_name='event_old', - ), - # Add field event as ForeignKey to Event model (with NULL allowed for now) - migrations.AddField( - model_name='talk', - name='event', - field=models.ForeignKey(to='proposals.Event', null=True), - ), - # We slightly need to modify the ordering to work with the M2M - migrations.AlterModelOptions( - name='talk', - options={'ordering': ('event__id',)}, - ), - # Migrate the data from event_old field to event field - migrations.RunPython(migrate_event), - # Remove the event_old field as data have been migrated - migrations.RemoveField( - model_name='talk', - name='event_old', - ), - # As data are now migrated, switch to null=False for event field - migrations.AlterField( - model_name='talk', - name='event', - field=models.ForeignKey(to='proposals.Event') - ), - ] diff --git a/proposals/migrations/0011_auto_20160921_2236.py b/proposals/migrations/0011_auto_20160921_2236.py deleted file mode 100644 index 66b1b5b..0000000 --- a/proposals/migrations/0011_auto_20160921_2236.py +++ /dev/null @@ -1,48 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-21 22:36 -from __future__ import unicode_literals - -import autoslug.fields -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('sites', '0002_alter_domain_unique'), - ('proposals', '0010_auto_20160822_1010'), - ] - - operations = [ - migrations.CreateModel( - name='Track', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created', models.DateTimeField(auto_now_add=True)), - ('updated', models.DateTimeField(auto_now=True)), - ('name', models.CharField(max_length=128, verbose_name='Name')), - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), - ('description', models.TextField(blank=True, verbose_name='Description')), - ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), - ], - ), - migrations.AlterModelOptions( - name='event', - options={'ordering': ('pk',)}, - ), - migrations.AlterField( - model_name='talk', - name='event', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='proposals.Event', verbose_name='Intervention kind'), - ), - migrations.AddField( - model_name='talk', - name='track', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='proposals.Track', verbose_name='Track'), - ), - migrations.AlterUniqueTogether( - name='track', - unique_together=set([('site', 'name')]), - ), - ] diff --git a/proposals/migrations/0012_topic_track.py b/proposals/migrations/0012_topic_track.py deleted file mode 100644 index 431ff69..0000000 --- a/proposals/migrations/0012_topic_track.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-09-22 09:46 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0011_auto_20160921_2236'), - ] - - operations = [ - migrations.AddField( - model_name='topic', - name='track', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='proposals.Track', verbose_name='Destination track'), - ), - ] diff --git a/proposals/migrations/0013_auto_20160928_1802.py b/proposals/migrations/0013_auto_20160928_1802.py deleted file mode 100644 index dbee273..0000000 --- a/proposals/migrations/0013_auto_20160928_1802.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-09-28 18:02 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0012_topic_track'), - ] - - operations = [ - migrations.AddField( - model_name='conference', - name='cfp_closing_date', - field=models.DateTimeField(blank=True, default=None, null=True), - ), - migrations.AddField( - model_name='conference', - name='cfp_opening_date', - field=models.DateTimeField(blank=True, default=None, null=True), - ), - ] diff --git a/proposals/migrations/0014_track_managers.py b/proposals/migrations/0014_track_managers.py deleted file mode 100644 index 0a995d5..0000000 --- a/proposals/migrations/0014_track_managers.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-05 19:02 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('proposals', '0013_auto_20160928_1802'), - ] - - operations = [ - migrations.AddField( - model_name='track', - name='managers', - field=models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL, verbose_name='Managers'), - ), - ] diff --git a/proposals/migrations/0015_auto_20161005_1932.py b/proposals/migrations/0015_auto_20161005_1932.py deleted file mode 100644 index 28b337c..0000000 --- a/proposals/migrations/0015_auto_20161005_1932.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-05 19:32 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0014_track_managers'), - ] - - operations = [ - migrations.AddField( - model_name='event', - name='duration', - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name='talk', - name='duration', - field=models.IntegerField(default=0), - ), - ] diff --git a/proposals/migrations/0016_auto_20161005_2027.py b/proposals/migrations/0016_auto_20161005_2027.py deleted file mode 100644 index 2bfb4ab..0000000 --- a/proposals/migrations/0016_auto_20161005_2027.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-05 20:27 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0015_auto_20161005_1932'), - ] - - operations = [ - migrations.AlterField( - model_name='event', - name='duration', - field=models.IntegerField(default=0, verbose_name='Duration (min)'), - ), - migrations.AlterField( - model_name='talk', - name='duration', - field=models.IntegerField(default=0, verbose_name='Duration (min)'), - ), - ] diff --git a/proposals/migrations/0017_talk_start_date.py b/proposals/migrations/0017_talk_start_date.py deleted file mode 100644 index 95cdcdd..0000000 --- a/proposals/migrations/0017_talk_start_date.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-10 22:12 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0016_auto_20161005_2027'), - ] - - operations = [ - migrations.AddField( - model_name='talk', - name='start_date', - field=models.DateTimeField(default=None, null=True), - ), - ] diff --git a/proposals/migrations/0018_talk_room.py b/proposals/migrations/0018_talk_room.py deleted file mode 100644 index b162089..0000000 --- a/proposals/migrations/0018_talk_room.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-10-11 09:30 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('planning', '0003_room_label'), - ('proposals', '0017_talk_start_date'), - ] - - operations = [ - migrations.AddField( - model_name='talk', - name='room', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='planning.Room'), - ), - ] diff --git a/proposals/migrations/0019_auto_20161011_1720.py b/proposals/migrations/0019_auto_20161011_1720.py deleted file mode 100644 index 05a3ba0..0000000 --- a/proposals/migrations/0019_auto_20161011_1720.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-10-11 17:20 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0018_talk_room'), - ] - - operations = [ - migrations.AlterField( - model_name='talk', - name='room', - field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='planning.Room'), - ), - migrations.AlterField( - model_name='talk', - name='start_date', - field=models.DateTimeField(blank=True, default=None, null=True), - ), - ] diff --git a/proposals/migrations/0020_auto_20161015_1201.py b/proposals/migrations/0020_auto_20161015_1201.py deleted file mode 100644 index 064a5a3..0000000 --- a/proposals/migrations/0020_auto_20161015_1201.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-15 12:01 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0019_auto_20161011_1720'), - ] - - operations = [ - migrations.AlterField( - model_name='talk', - name='title', - field=models.CharField(help_text='After submission, title can only be changed by the staff.', max_length=128, verbose_name='Title'), - ), - migrations.AlterField( - model_name='talk', - name='topics', - field=models.ManyToManyField(blank=True, help_text='The topics can not be changed after submission.', to='proposals.Topic', verbose_name='Topics'), - ), - ] diff --git a/proposals/migrations/0021_auto_20161016_2121.py b/proposals/migrations/0021_auto_20161016_2121.py deleted file mode 100644 index 93c633c..0000000 --- a/proposals/migrations/0021_auto_20161016_2121.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-16 21:21 -from __future__ import unicode_literals - -import colorful.fields -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0020_auto_20161015_1201'), - ] - - operations = [ - migrations.AddField( - model_name='event', - name='color', - field=colorful.fields.RGBColorField(default='#ffffff', verbose_name='Color on program'), - ), - migrations.AlterField( - model_name='event', - name='duration', - field=models.IntegerField(default=0, verbose_name='Default duration (min)'), - ), - ] diff --git a/proposals/migrations/0022_auto_20161019_1141.py b/proposals/migrations/0022_auto_20161019_1141.py deleted file mode 100644 index ad7b9a6..0000000 --- a/proposals/migrations/0022_auto_20161019_1141.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-10-19 11:41 -from __future__ import unicode_literals - -from django.db import migrations, models - - -def migrate_durations(apps, schema_editor): - db_alias = schema_editor.connection.alias - Event = apps.get_model('proposals', 'Event') - for event in Event.objects.all(): - if event.duration < 0: - event.duration = 0 - event.save() - Talk = apps.get_model('proposals', 'Talk') - for talk in Talk.objects.all(): - if talk.duration < 0: - talk.duration = 0 - talk.save() - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0021_auto_20161016_2121'), - ] - - operations = [ - migrations.RunPython(migrate_durations), - migrations.AlterField( - model_name='event', - name='duration', - field=models.PositiveIntegerField(default=0, verbose_name='Default duration (min)'), - ), - migrations.AlterField( - model_name='talk', - name='duration', - field=models.PositiveIntegerField(default=0, verbose_name='Duration (min)'), - ), - ] diff --git a/proposals/migrations/0022_talk_plenary.py b/proposals/migrations/0022_talk_plenary.py deleted file mode 100644 index aa69798..0000000 --- a/proposals/migrations/0022_talk_plenary.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-19 19:26 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0021_auto_20161016_2121'), - ] - - operations = [ - migrations.AddField( - model_name='talk', - name='plenary', - field=models.BooleanField(default=False), - ), - ] diff --git a/proposals/migrations/0023_merge_20161019_2040.py b/proposals/migrations/0023_merge_20161019_2040.py deleted file mode 100644 index aa48ba9..0000000 --- a/proposals/migrations/0023_merge_20161019_2040.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-19 20:40 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0022_auto_20161019_1141'), - ('proposals', '0022_talk_plenary'), - ] - - operations = [ - ] diff --git a/proposals/migrations/0024_auto_20161024_1313.py b/proposals/migrations/0024_auto_20161024_1313.py deleted file mode 100644 index 2ba4eb7..0000000 --- a/proposals/migrations/0024_auto_20161024_1313.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-10-24 13:13 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0023_merge_20161019_2040'), - ] - - operations = [ - migrations.AddField( - model_name='conference', - name='city', - field=models.CharField(blank=True, default='', max_length=64), - ), - migrations.AddField( - model_name='conference', - name='venue', - field=models.TextField(blank=True, default=''), - ), - ] diff --git a/proposals/migrations/0025_event_label.py b/proposals/migrations/0025_event_label.py deleted file mode 100644 index ec35b4f..0000000 --- a/proposals/migrations/0025_event_label.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-31 12:15 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0024_auto_20161024_1313'), - ] - - operations = [ - migrations.AddField( - model_name='event', - name='label', - field=models.CharField(blank=True, default='', max_length=64, verbose_name='Label on program'), - ), - ] diff --git a/proposals/migrations/0026_auto_20161106_2319.py b/proposals/migrations/0026_auto_20161106_2319.py deleted file mode 100644 index aa91df2..0000000 --- a/proposals/migrations/0026_auto_20161106_2319.py +++ /dev/null @@ -1,47 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-06 23:19 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('proposals', '0025_event_label'), - ] - - operations = [ - migrations.CreateModel( - name='Attendee', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created', models.DateTimeField(auto_now_add=True)), - ('updated', models.DateTimeField(auto_now=True)), - ('name', models.CharField(blank=True, default='', max_length=64)), - ('email', models.EmailField(blank=True, default='', max_length=254)), - ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'abstract': False, - }, - ), - migrations.AddField( - model_name='talk', - name='attendees_limit', - field=models.PositiveIntegerField(default=0, verbose_name='Max. number of attendees'), - ), - migrations.AddField( - model_name='talk', - name='registration_required', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='talk', - name='attendees', - field=models.ManyToManyField(to='proposals.Attendee', verbose_name='Attendees'), - ), - ] diff --git a/proposals/migrations/0027_conference_subscriptions_open.py b/proposals/migrations/0027_conference_subscriptions_open.py deleted file mode 100644 index fe1a628..0000000 --- a/proposals/migrations/0027_conference_subscriptions_open.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-07 22:05 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0026_auto_20161106_2319'), - ] - - operations = [ - migrations.AddField( - model_name='conference', - name='subscriptions_open', - field=models.BooleanField(default=False), - ), - ] diff --git a/proposals/migrations/0028_auto_20161113_2204.py b/proposals/migrations/0028_auto_20161113_2204.py deleted file mode 100644 index 97d3a80..0000000 --- a/proposals/migrations/0028_auto_20161113_2204.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-13 22:04 -from __future__ import unicode_literals - -from django.db import migrations, models - - -def migrate_opening_closing_dates(apps, schema_editor): - db_alias = schema_editor.connection.alias - Conference = apps.get_model('proposals', 'Conference') - Event = apps.get_model('proposals', 'Event') - for conf in Conference.objects.all(): - for event in Event.objects.filter(site=conf.site).all(): - event.opening_date = conf.cfp_opening_date - event.closing_date = conf.cfp_closing_date - event.save() - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0027_conference_subscriptions_open'), - ] - - operations = [ - migrations.AddField( - model_name='event', - name='closing_date', - field=models.DateTimeField(blank=True, default=None, null=True), - ), - migrations.AddField( - model_name='event', - name='opening_date', - field=models.DateTimeField(blank=True, default=None, null=True), - ), - migrations.RunPython(migrate_opening_closing_dates), - migrations.RemoveField( - model_name='conference', - name='cfp_closing_date', - ), - migrations.RemoveField( - model_name='conference', - name='cfp_opening_date', - ), - ] diff --git a/proposals/migrations/0029_talk_materials.py b/proposals/migrations/0029_talk_materials.py deleted file mode 100644 index 525e37a..0000000 --- a/proposals/migrations/0029_talk_materials.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-23 22:36 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0028_auto_20161113_2204'), - ] - - operations = [ - migrations.AddField( - model_name='talk', - name='materials', - field=models.FileField(help_text='You can use this field to share some materials related to your intervention.', null=True, upload_to='', verbose_name='Materials'), - ), - ] diff --git a/proposals/migrations/0030_auto_20170113_1044.py b/proposals/migrations/0030_auto_20170113_1044.py deleted file mode 100644 index 07663c5..0000000 --- a/proposals/migrations/0030_auto_20170113_1044.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.3 on 2017-01-13 10:44 -from __future__ import unicode_literals - -from django.db import migrations, models -import proposals.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('proposals', '0029_talk_materials'), - ] - - operations = [ - migrations.AlterField( - model_name='talk', - name='materials', - field=models.FileField(help_text='You can use this field to share some materials related to your intervention.', null=True, upload_to=proposals.models.talk_materials_destination, verbose_name='Materials'), - ), - ] diff --git a/volunteers/migrations/0001_initial.py b/volunteers/migrations/0001_initial.py index 3fcd7f2..4a7767a 100644 --- a/volunteers/migrations/0001_initial.py +++ b/volunteers/migrations/0001_initial.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-19 21:17 +# Generated by Django 1.10.3 on 2017-01-13 10:49 from __future__ import unicode_literals +import autoslug.fields from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -12,8 +13,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('sites', '0002_alter_domain_unique'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('sites', '0002_alter_domain_unique'), ] operations = [ @@ -22,10 +23,15 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=256, verbose_name='Name')), + ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), ('description', models.TextField(blank=True, verbose_name='Description')), - ('participants', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL, verbose_name='Participants')), + ('participants', models.ManyToManyField(blank=True, related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Participants')), ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), ], + options={ + 'verbose_name_plural': 'Activities', + 'verbose_name': 'Activity', + }, ), migrations.AlterUniqueTogether( name='activity', diff --git a/volunteers/migrations/0002_activity_slug.py b/volunteers/migrations/0002_activity_slug.py deleted file mode 100644 index d1070f9..0000000 --- a/volunteers/migrations/0002_activity_slug.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-21 23:07 -from __future__ import unicode_literals - -import autoslug.fields -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('volunteers', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='activity', - name='slug', - field=autoslug.fields.AutoSlugField(default='', editable=False, populate_from='name'), - preserve_default=False, - ), - ] diff --git a/volunteers/migrations/0003_auto_20161024_1313.py b/volunteers/migrations/0003_auto_20161024_1313.py deleted file mode 100644 index 12905a6..0000000 --- a/volunteers/migrations/0003_auto_20161024_1313.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-10-24 13:13 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('volunteers', '0002_activity_slug'), - ] - - operations = [ - migrations.AlterField( - model_name='activity', - name='participants', - field=models.ManyToManyField(blank=True, related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Participants'), - ), - ] diff --git a/volunteers/migrations/0004_auto_20161113_1908.py b/volunteers/migrations/0004_auto_20161113_1908.py deleted file mode 100644 index f822e32..0000000 --- a/volunteers/migrations/0004_auto_20161113_1908.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-13 19:08 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('volunteers', '0003_auto_20161024_1313'), - ] - - operations = [ - migrations.AlterModelOptions( - name='activity', - options={'verbose_name': 'Activity', 'verbose_name_plural': 'Activities'}, - ), - ]