From 60ddd61727ad7f21bd0c1a588eeb3f05b845dd00 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Fri, 3 Mar 2017 21:17:12 +0000
Subject: [PATCH] Tweaked Message.msgid and added needed migrations for the
 field.  The first migration creates the new column with NULL values for
 existing rows, the second adds creation of msgid values by default for new
 rows.  - Legacy-Id: 12961

---
 ietf/message/migrations/0003_message_msgid.py | 20 ++++++++++++++++++
 .../migrations/0004_auto_20170303_1310.py     | 21 +++++++++++++++++++
 ietf/message/models.py                        |  2 +-
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 ietf/message/migrations/0003_message_msgid.py
 create mode 100644 ietf/message/migrations/0004_auto_20170303_1310.py

diff --git a/ietf/message/migrations/0003_message_msgid.py b/ietf/message/migrations/0003_message_msgid.py
new file mode 100644
index 000000000..729b0fe4f
--- /dev/null
+++ b/ietf/message/migrations/0003_message_msgid.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-03-03 13:04
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('message', '0002_messageattachment'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='message',
+            name='msgid',
+            field=models.CharField(blank=True, default=None, max_length=255, null=True),
+        ),
+    ]
diff --git a/ietf/message/migrations/0004_auto_20170303_1310.py b/ietf/message/migrations/0004_auto_20170303_1310.py
new file mode 100644
index 000000000..814d1fa29
--- /dev/null
+++ b/ietf/message/migrations/0004_auto_20170303_1310.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-03-03 13:10
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import email.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('message', '0003_message_msgid'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='message',
+            name='msgid',
+            field=models.CharField(blank=True, default=email.utils.make_msgid, max_length=255, null=True),
+        ),
+    ]
diff --git a/ietf/message/models.py b/ietf/message/models.py
index f1af3af95..2670eb139 100644
--- a/ietf/message/models.py
+++ b/ietf/message/models.py
@@ -21,7 +21,7 @@ class Message(models.Model):
     reply_to = models.CharField(max_length=255, blank=True)
     body = models.TextField()
     content_type = models.CharField(default="text/plain", max_length=255, blank=True)
-    msgid = models.CharField(max_length=255, blank=True, default=email.utils.make_msgid)
+    msgid = models.CharField(max_length=255, blank=True, null=True, default=email.utils.make_msgid)
 
     related_groups = models.ManyToManyField(Group, blank=True)
     related_docs = models.ManyToManyField(Document, blank=True)