Merge remote-tracking branch 'origin'

VERSION

@@ -1 +1 @@
-0.10.7
+0.10.8

core/migrations/0054_auto_20180612_1305.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.13 on 2018-06-12 13:05
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0053_auto_20180605_1214'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='email_wanted',
+            field=models.NullBooleanField(default=False, help_text='Whether to consent to receiving notifications via email.', verbose_name='Consent for sending email'),
+        ),
+    ]

core/models.py

@@ -44,8 +44,17 @@ class UserProfile(models.Model):
     picture = models.ImageField(upload_to='profiles', verbose_name=_("Picture"), null=True, blank=True)
     joined_org = models.DateTimeField(null=True, blank=True) # Time when user joined organization, as opposed to registered in the system
 
-    # User settings
-    email_wanted = models.BooleanField(default=False, verbose_name=_('Consent for sending email'), help_text=_('Whether to consent to receiving notifications via email.'))
+    # When this is null (None), it means that the user has not consented to,
+    # nor specifically rejected receiving email. This is a left-over state
+    # from when implied consent sufficed, but should gradually be decreased
+    # until all users have either consented or not. No new members should have
+    # this field as null (None).
+    email_wanted = models.NullBooleanField(
+        default=False,
+        verbose_name=_('Consent for sending email'),
+        help_text=_('Whether to consent to receiving notifications via email.')
+    )
+
     language = models.CharField(max_length=6, default='en', choices=settings.LANGUAGES, verbose_name=_("Language"))
     topics_showall = models.BooleanField(default=True, help_text=_("Whether to show all topics in a polity, or only starred."))