Merge branch 'master' into django-v2-circleci

pinax · Nov 7, 2017 · d624921 · d624921
2 parents d4663fa + 04c74b9
commit d624921
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/pinax/invitations/migrations/0001_initial.py b/pinax/invitations/migrations/0001_initial.py
@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
                 ('invites_sent', models.IntegerField(default=0)),
                 ('invites_allocated', models.IntegerField(default=0)),
                 ('invites_accepted', models.IntegerField(default=0)),
-                ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)),
+                ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
             options={
             },
@@ -34,9 +34,9 @@ class Migration(migrations.Migration):
                 ('message', models.TextField(null=True)),
                 ('sent', models.DateTimeField(default=django.utils.timezone.now)),
                 ('status', models.IntegerField(choices=[(1, b'Sent'), (2, b'Accepted'), (3, b'Joined Independently')])),
-                ('from_user', models.ForeignKey(related_name='invites_sent', to=settings.AUTH_USER_MODEL)),
-                ('signup_code', models.OneToOneField(to='account.SignupCode')),
-                ('to_user', models.ForeignKey(related_name='invites_received', to=settings.AUTH_USER_MODEL, null=True)),
+                ('from_user', models.ForeignKey(related_name='invites_sent', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+                ('signup_code', models.OneToOneField(to='account.SignupCode', on_delete=models.CASCADE)),
+                ('to_user', models.ForeignKey(related_name='invites_received', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE, null=True)),
             ],
             options={
             },

diff --git a/pinax/invitations/models.py b/pinax/invitations/models.py
@@ -24,16 +24,21 @@ class JoinInvitation(models.Model):
         (STATUS_JOINED_INDEPENDENTLY, "Joined Independently")
     ]
 
-    from_user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name="invites_sent")
+    from_user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="invites_sent",
+    )
     to_user = models.ForeignKey(
         settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
         null=True,
         related_name="invites_received"
     )
     message = models.TextField(null=True)
     sent = models.DateTimeField(default=timezone.now)
     status = models.IntegerField(choices=INVITE_STATUS_CHOICES)
-    signup_code = models.OneToOneField(SignupCode)
+    signup_code = models.OneToOneField(SignupCode, on_delete=models.CASCADE)
 
     def to_user_email(self):
         return self.signup_code.email
@@ -91,7 +96,7 @@ def send_invite(*args, **kwargs):
 
 class InvitationStat(models.Model):
 
-    user = models.OneToOneField(settings.AUTH_USER_MODEL)
+    user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     invites_sent = models.IntegerField(default=0)
     invites_allocated = models.IntegerField(
         default=settings.PINAX_INVITATIONS_DEFAULT_INVITE_ALLOCATION

diff --git a/pinax/invitations/urls.py b/pinax/invitations/urls.py
@@ -9,6 +9,8 @@
     TopOffUserView
 )
 
+app_name = "pinax_invitations"
+
 urlpatterns = [
     url(r"^invite/$", InviteView.as_view(), name="invite"),
     url(r"^invite-stat/(?P<pk>\d+)/$", InviteStatView.as_view(), name="invite_stat"),