From d179a0a6d0f960fb8beb70858bfa21834e7adea7 Mon Sep 17 00:00:00 2001 From: klmp200 Date: Tue, 22 Aug 2017 15:34:48 +0200 Subject: [PATCH] Fix typo and merge migrations --- club/migrations/0009_auto_20170822_1529.py | 39 +++++++++++++++++++ .../0009_mailing_mailingsubscription.py | 33 ---------------- club/migrations/0010_auto_20170817_1537.py | 23 ----------- club/migrations/0011_auto_20170821_1702.py | 26 ------------- core/migrations/0021_auto_20170822_1529.py | 19 +++++++++ sith/settings.py | 2 +- 6 files changed, 59 insertions(+), 83 deletions(-) create mode 100644 club/migrations/0009_auto_20170822_1529.py delete mode 100644 club/migrations/0009_mailing_mailingsubscription.py delete mode 100644 club/migrations/0010_auto_20170817_1537.py delete mode 100644 club/migrations/0011_auto_20170821_1702.py create mode 100644 core/migrations/0021_auto_20170822_1529.py diff --git a/club/migrations/0009_auto_20170822_1529.py b/club/migrations/0009_auto_20170822_1529.py new file mode 100644 index 00000000..419f3890 --- /dev/null +++ b/club/migrations/0009_auto_20170822_1529.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +from django.conf import settings + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('club', '0008_auto_20170515_2214'), + ] + + operations = [ + migrations.CreateModel( + name='Mailing', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, primary_key=True, auto_created=True)), + ('email', models.EmailField(verbose_name='Email address', max_length=254, unique=True)), + ('is_moderated', models.BooleanField(verbose_name='is moderated', default=False)), + ('club', models.ForeignKey(related_name='mailings', to='club.Club', verbose_name='Club')), + ('moderator', models.ForeignKey(related_name='moderated_mailings', to=settings.AUTH_USER_MODEL, verbose_name='moderator', null=True)), + ], + ), + migrations.CreateModel( + name='MailingSubscription', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, primary_key=True, auto_created=True)), + ('email', models.EmailField(verbose_name='Email address', max_length=254)), + ('mailing', models.ForeignKey(related_name='subscriptions', to='club.Mailing', verbose_name='Mailing')), + ('user', models.ForeignKey(null=True, related_name='mailing_subscriptions', to=settings.AUTH_USER_MODEL, verbose_name='User', blank=True)), + ], + ), + migrations.AlterUniqueTogether( + name='mailingsubscription', + unique_together=set([('user', 'email', 'mailing')]), + ), + ] diff --git a/club/migrations/0009_mailing_mailingsubscription.py b/club/migrations/0009_mailing_mailingsubscription.py deleted file mode 100644 index a87fceeb..00000000 --- a/club/migrations/0009_mailing_mailingsubscription.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -from django.conf import settings - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('club', '0008_auto_20170515_2214'), - ] - - operations = [ - migrations.CreateModel( - name='Mailing', - fields=[ - ('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')), - ('email', models.EmailField(verbose_name='Email address', unique=True, max_length=254)), - ('club', models.ForeignKey(verbose_name='Club', related_name='mailings', to='club.Club')), - ], - ), - migrations.CreateModel( - name='MailingSubscription', - fields=[ - ('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')), - ('email', models.EmailField(verbose_name='Email address', max_length=254, unique=True)), - ('mailing', models.ForeignKey(verbose_name='Mailing', related_name='subscriptions', to='club.Mailing')), - ('user', models.ForeignKey(null=True, verbose_name='User', related_name='mailing_subscriptions', to=settings.AUTH_USER_MODEL, blank=True)), - ], - ), - ] diff --git a/club/migrations/0010_auto_20170817_1537.py b/club/migrations/0010_auto_20170817_1537.py deleted file mode 100644 index 24949949..00000000 --- a/club/migrations/0010_auto_20170817_1537.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('club', '0009_mailing_mailingsubscription'), - ] - - operations = [ - migrations.AlterField( - model_name='mailingsubscription', - name='email', - field=models.EmailField(verbose_name='Email address', max_length=254), - ), - migrations.AlterUniqueTogether( - name='mailingsubscription', - unique_together=set([('user', 'email', 'mailing')]), - ), - ] diff --git a/club/migrations/0011_auto_20170821_1702.py b/club/migrations/0011_auto_20170821_1702.py deleted file mode 100644 index 04588b8b..00000000 --- a/club/migrations/0011_auto_20170821_1702.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -from django.conf import settings - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('club', '0010_auto_20170817_1537'), - ] - - operations = [ - migrations.AddField( - model_name='mailing', - name='is_moderated', - field=models.BooleanField(default=False, verbose_name='is moderated'), - ), - migrations.AddField( - model_name='mailing', - name='moderator', - field=models.ForeignKey(related_name='moderated_mailings', to=settings.AUTH_USER_MODEL, null=True, verbose_name='moderator'), - ), - ] diff --git a/core/migrations/0021_auto_20170822_1529.py b/core/migrations/0021_auto_20170822_1529.py new file mode 100644 index 00000000..b38e737d --- /dev/null +++ b/core/migrations/0021_auto_20170822_1529.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0020_auto_20170324_0917'), + ] + + operations = [ + migrations.AlterField( + model_name='notification', + name='type', + field=models.CharField(verbose_name='type', default='GENERIC', max_length=32, choices=[('MAILING_MODERATION', 'A new mailing list neet to be moderated'), ('NEWS_MODERATION', 'A fresh new to be moderated'), ('FILE_MODERATION', 'New files to be moderated'), ('SAS_MODERATION', 'New pictures/album to be moderated in the SAS'), ('NEW_PICTURES', "You've been identified on some pictures"), ('REFILLING', 'You just refilled of %s €'), ('SELLING', 'You just bought %s'), ('GENERIC', 'You have a notification')]), + ), + ] diff --git a/sith/settings.py b/sith/settings.py index a448a394..abfed0ed 100644 --- a/sith/settings.py +++ b/sith/settings.py @@ -543,7 +543,7 @@ SITH_LAUNDERETTE_PRICES = { } SITH_NOTIFICATIONS = [ - ('MAILING_MODERATION', _("A new mailing list neet to be moderated")), + ('MAILING_MODERATION', _("A new mailing list needs to be moderated")), ('NEWS_MODERATION', _("A fresh new to be moderated")), ('FILE_MODERATION', _("New files to be moderated")), ('SAS_MODERATION', _("New pictures/album to be moderated in the SAS")),