Make some fields on Speaker model optional.

This makes it easier to add/edit Speakers in the admin.

  - Make User relationship optional (since some Speakers will not have a
    User account associated with them if they are additional speakers to
    a proposal) by setting blank=True.
  - Make annotation field optional (similar to the field on the Sponsor
    model).
  - Make invite_email and invite_token fields optional by setting
    blank=True, since conventional Speakers attached to User accounts do
    not need these fields. This removes the uniqueness constraint from
    invite_token, but since null=True was set on that field (see
    https://docs.djangoproject.com/en/1.9/ref/models/fields/#django.db.models.Field.null),
    it wasn't really unique anyway.

Note that this commit differs from the one in
pinax#155 in that the associated
migration is #4, not #3. This prevents migration conflicts within this
branch, but does not apply cleanly to master by itself.

Author: martey

symposion/speakers/migrations/0004_make_fields_optional.py

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.12 on 2017-01-20 07:40
+from __future__ import unicode_literals
+
+import datetime
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('symposion_speakers', '0003_make_speaker_created_timezone_aware'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='speaker',
+            name='annotation',
+            field=models.TextField(blank=True, verbose_name='Annotation'),
+        ),
+        migrations.AlterField(
+            model_name='speaker',
+            name='created',
+            field=models.DateTimeField(default=datetime.datetime.now, editable=False, verbose_name='Created'),
+        ),
+        migrations.AlterField(
+            model_name='speaker',
+            name='invite_email',
+            field=models.CharField(blank=True, db_index=True, default='', max_length=200, verbose_name='Invite_email'),
+        ),
+        migrations.AlterField(
+            model_name='speaker',
+            name='invite_token',
+            field=models.CharField(blank=True, db_index=True, max_length=40, verbose_name='Invite token'),
+        ),
+        migrations.AlterField(
+            model_name='speaker',
+            name='user',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='speaker_profile', to=settings.AUTH_USER_MODEL, verbose_name='User'),
+        ),
+    ]

symposion/speakers/models.py

@@ -19,7 +19,7 @@ class Speaker(models.Model):
         (2, "Two")
     ]
 
-    user = models.OneToOneField(User, null=True, related_name="speaker_profile", verbose_name=_("User"))
+    user = models.OneToOneField(User, blank=True, null=True, related_name="speaker_profile", verbose_name=_("User"))
     name = models.CharField(verbose_name=_("Name"), max_length=100,
                             help_text=_("As you would like it to appear in the"
                                         " conference program."))
@@ -34,9 +34,9 @@ class Speaker(models.Model):
         blank=True,
         help_text=_(u"Your Twitter account")
     )
-    annotation = models.TextField(verbose_name=_("Annotation"))  # staff only
-    invite_email = models.CharField(max_length=200, unique=True, null=True, db_index=True, verbose_name=_("Invite_email"))
-    invite_token = models.CharField(max_length=40, db_index=True, verbose_name=_("Invite token"))
+    annotation = models.TextField(blank=True, verbose_name=_("Annotation"))  # staff only
+    invite_email = models.CharField(blank=True, default="", max_length=200, db_index=True, verbose_name=_("Invite_email"))
+    invite_token = models.CharField(blank=True, max_length=40, db_index=True, verbose_name=_("Invite token"))
     created = models.DateTimeField(
         default=timezone.now,
         editable=False,