Merge branch 'master' of edugit.org:AlekSIS/AlekSIS

aleksis/core/migrations/0003_auto_20200105_1832.py

+# Generated by Django 3.0.2 on 2020-01-05 18:32
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0002_activity_notification'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='activity',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='core.Person'),
+        ),
+        migrations.AlterField(
+            model_name='notification',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notifications', to='core.Person'),
+        ),
+    ]

aleksis/core/models.py

@@ -166,7 +166,7 @@ class Group(models.Model, ExtensibleModel):
 
 
 class Activity(models.Model):
-    user = models.ForeignKey(to=User, on_delete=models.CASCADE)
+    user = models.ForeignKey("Person", on_delete=models.CASCADE, related_name="activities")
 
     title = models.CharField(max_length=150)
     description = models.TextField(max_length=500)
@@ -180,7 +180,7 @@ class Activity(models.Model):
 
 
 class Notification(models.Model):
-    user = models.ForeignKey(to=User, on_delete=models.CASCADE, related_name="notifications")
+    user = models.ForeignKey("Person", on_delete=models.CASCADE, related_name="notifications")
     title = models.CharField(max_length=150)
     description = models.TextField(max_length=500)
     link = models.URLField(blank=True)