diff --git a/push_notifications/migrations/0001_initial.py b/push_notifications/migrations/0001_initial.py index 14033f16..d017b703 100644 --- a/push_notifications/migrations/0001_initial.py +++ b/push_notifications/migrations/0001_initial.py @@ -1,15 +1,14 @@ # -*- coding: utf-8 -*- -from django.conf import settings from django.db import migrations, models import push_notifications.fields +from ..settings import PUSH_NOTIFICATIONS_SETTINGS as SETTINGS + class Migration(migrations.Migration): - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] + USER_MODEL = SETTINGS["USER_MODEL"] operations = [ migrations.CreateModel( @@ -21,7 +20,7 @@ class Migration(migrations.Migration): ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Creation date', null=True)), ('device_id', models.UUIDField(help_text='UDID / UIDevice.identifierForVendor()', max_length=32, null=True, verbose_name='Device ID', blank=True, db_index=True)), ('registration_id', models.CharField(unique=True, max_length=64, verbose_name='Registration ID')), - ('user', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE)), + ('user', models.ForeignKey(blank=True, to=USER_MODEL, null=True, on_delete=models.CASCADE)), ], options={ 'verbose_name': 'APNS device', @@ -37,7 +36,7 @@ class Migration(migrations.Migration): ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Creation date', null=True)), ('device_id', push_notifications.fields.HexIntegerField(help_text='ANDROID_ID / TelephonyManager.getDeviceId() (always as hex)', null=True, verbose_name='Device ID', blank=True, db_index=True)), ('registration_id', models.TextField(verbose_name='Registration ID')), - ('user', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE)), + ('user', models.ForeignKey(blank=True, to=USER_MODEL, null=True, on_delete=models.CASCADE)), ], options={ 'verbose_name': 'GCM device', diff --git a/push_notifications/migrations/0003_wnsdevice.py b/push_notifications/migrations/0003_wnsdevice.py index 6c6b5c3a..a51f2b94 100644 --- a/push_notifications/migrations/0003_wnsdevice.py +++ b/push_notifications/migrations/0003_wnsdevice.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-06-13 20:46 import django.db.models.deletion -from django.conf import settings from django.db import migrations, models +from ..settings import PUSH_NOTIFICATIONS_SETTINGS as SETTINGS + class Migration(migrations.Migration): dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('push_notifications', '0002_auto_20160106_0850'), ] @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('date_created', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Creation date')), ('device_id', models.UUIDField(blank=True, db_index=True, help_text='GUID()', null=True, verbose_name='Device ID')), ('registration_id', models.TextField(verbose_name='Notification URI')), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=SETTINGS["USER_MODEL"])), ], options={ 'verbose_name': 'WNS device', diff --git a/push_notifications/migrations/0004_fcm.py b/push_notifications/migrations/0004_fcm.py index be35f4c4..2c71adf7 100644 --- a/push_notifications/migrations/0004_fcm.py +++ b/push_notifications/migrations/0004_fcm.py @@ -1,13 +1,11 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-06-13 20:46 -from django.conf import settings from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('push_notifications', '0003_wnsdevice'), ] diff --git a/push_notifications/migrations/0006_webpushdevice.py b/push_notifications/migrations/0006_webpushdevice.py index c63c2490..141d48bc 100644 --- a/push_notifications/migrations/0006_webpushdevice.py +++ b/push_notifications/migrations/0006_webpushdevice.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -from django.conf import settings from django.db import migrations, models +from ..settings import PUSH_NOTIFICATIONS_SETTINGS as SETTINGS + class Migration(migrations.Migration): dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('push_notifications', '0005_applicationid'), ] @@ -23,7 +23,7 @@ class Migration(migrations.Migration): ('p256dh', models.CharField(max_length=88, verbose_name='User public encryption key')), ('auth', models.CharField(max_length=24, verbose_name='User auth secret')), ('browser', models.CharField(default='CHROME', help_text='Currently only support to Chrome, Firefox and Opera browsers', max_length=10, verbose_name='Browser', choices=[('CHROME', 'Chrome'), ('FIREFOX', 'Firefox'), ('OPERA', 'Opera')])), - ('user', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE)), + ('user', models.ForeignKey(blank=True, to=SETTINGS["USER_MODEL"], null=True, on_delete=models.CASCADE)), ], options={ 'verbose_name': 'WebPush device',