Removed user related link from interlink models

nadineproject · Dec 30, 2019 · 25c9df3 · 25c9df3
1 parent 7398929
commit 25c9df3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/interlink/migrations/0006_auto_20191230_1550.py b/interlink/migrations/0006_auto_20191230_1550.py
@@ -0,0 +1,29 @@
+# Generated by Django 2.2.9 on 2019-12-30 23:50
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('interlink', '0005_mailinglist_enabled'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='mailinglist',
+            name='moderators',
+            field=models.ManyToManyField(blank=True, limit_choices_to={'is_staff': True}, related_name='interlink_moderated', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='mailinglist',
+            name='subscribers',
+            field=models.ManyToManyField(blank=True, related_name='interlink_subscriptions', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='mailinglist',
+            name='unsubscribed',
+            field=models.ManyToManyField(blank=True, related_name='interlink_unsubscribed', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/interlink/models.py b/interlink/models.py
@@ -75,9 +75,9 @@ class MailingList(models.Model):
     smtp_host = models.CharField(max_length=1024)
     smtp_port = models.IntegerField(default=587)
 
-    subscribers = models.ManyToManyField(User, blank=True, related_name='subscribed_mailing_lists')
-    unsubscribed = models.ManyToManyField(User, blank=True, related_name='+')
-    moderators = models.ManyToManyField(User, blank=True, related_name='moderated_mailing_lists', help_text='Users who will be sent moderation emails', limit_choices_to={'is_staff': True})
+    subscribers = models.ManyToManyField(settings.AUTH_USER_MODEL, blank=True, related_name='interlink_subscriptions')
+    unsubscribed = models.ManyToManyField(settings.AUTH_USER_MODEL, blank=True, related_name='interlink_unsubscribed')
+    moderators = models.ManyToManyField(settings.AUTH_USER_MODEL, blank=True, related_name='interlink_moderated', limit_choices_to={'is_staff': True})
 
     throttle_limit = models.IntegerField(default=0, help_text='The number of recipients in 10 minutes this mailing list is limited to. Default is 0, which means no limit.')