Merge branch '1.7' of github.com:nadineproject/nadine into 1.7

nadine/migrations/0001_initial.py

@@ -310,6 +310,20 @@ class Migration(migrations.Migration):
             },
             bases=(models.Model,),
         ),
+        migrations.CreateModel(
+            name='MemberAlert',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_ts', models.DateTimeField(auto_now_add=True)),
+                ('key', models.CharField(max_length=16)),
+                ('resolved_ts', models.DateTimeField(null=True)),
+                ('muted_ts', models.DateTimeField(null=True)),
+                ('note', models.TextField(blank=True, null=True)),
+                ('muted_by', models.ForeignKey(null=True, related_name='muted_by', to=settings.AUTH_USER_MODEL)),
+                ('resolved_by', models.ForeignKey(null=True, related_name='resolved_by', to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
         migrations.AlterUniqueTogether(
             name='onboard_task_completed',
             unique_together=set([('member', 'task')]),

nadine/migrations/0025_assigned_alerts.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2016-12-30 18:34
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('nadine', '0024_websites'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='memberalert',
+            name='assigned_to',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='assigned_alerts', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='memberalert',
+            name='muted_by',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='muted_alerts', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='memberalert',
+            name='resolved_by',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='resolved_alerts', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

nadine/models/alerts.py

@@ -262,9 +262,10 @@ def isSystemAlert(key):
     key = models.CharField(max_length=16)
     user = models.ForeignKey(User)
     resolved_ts = models.DateTimeField(null=True)
-    resolved_by = models.ForeignKey(User, related_name="resolved_by", null=True)
+    resolved_by = models.ForeignKey(User, related_name="resolved_alerts", null=True)
     muted_ts = models.DateTimeField(null=True)
-    muted_by = models.ForeignKey(User, related_name="muted_by", null=True)
+    muted_by = models.ForeignKey(User, related_name="muted_alerts", null=True)
+    assigned_to = models.ForeignKey(User, related_name="assigned_alerts", null=True)
     note = models.TextField(blank=True, null=True)
     objects = MemberAlertManager()