Merge branch 'master' of github.com:joeyorlando/django-push-notifications

Author: joeyorlando

push_notifications/migrations/0001_initial.py

@@ -8,9 +8,11 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        migrations.swappable_dependency(settings.PUSH_NOTIFICATION_SETTINGS),
     ]
 
+    USER_MODEL = settings.PUSH_NOTIFICATION_SETTINGS["USER_MODEL"]
+
     operations = [
         migrations.CreateModel(
             name='APNSDevice',
@@ -21,7 +23,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 +39,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',

push_notifications/migrations/0003_wnsdevice.py

@@ -8,10 +8,12 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        migrations.swappable_dependency(settings.PUSH_NOTIFICATION_SETTINGS),
         ('push_notifications', '0002_auto_20160106_0850'),
     ]
 
+    USER_MODEL = settings.PUSH_NOTIFICATION_SETTINGS["USER_MODEL"]
+
     operations = [
         migrations.CreateModel(
             name='WNSDevice',
@@ -22,7 +24,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=USER_MODEL)),
             ],
             options={
                 'verbose_name': 'WNS device',

push_notifications/migrations/0004_fcm.py

@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
 	dependencies = [
-		migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+		migrations.swappable_dependency(settings.PUSH_NOTIFICATION_SETTINGS),
 		('push_notifications', '0003_wnsdevice'),
 	]
 

push_notifications/migrations/0006_webpushdevice.py

@@ -6,10 +6,12 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        migrations.swappable_dependency(settings.PUSH_NOTIFICATION_SETTINGS),
         ('push_notifications', '0005_applicationid'),
     ]
 
+    USER_MODEL = settings.PUSH_NOTIFICATION_SETTINGS["USER_MODEL"]
+
     operations = [
         migrations.CreateModel(
             name='WebPushDevice',
@@ -23,7 +25,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=USER_MODEL, null=True, on_delete=models.CASCADE)),
             ],
             options={
                 'verbose_name': 'WebPush device',