From dedc82d564993139f72102e3d2330f2fb64b1244 Mon Sep 17 00:00:00 2001
From: Sawyer Bergeron <sbergeron@iol.unh.edu>
Date: Wed, 10 Jan 2018 11:44:23 -0500
Subject: Add Nullable Lab Field to Resources

Jira: PHAROS-347

Resources are now possible to associate with lab instances upon creation

Change-Id: Id8abbcc448a6d840d55e4bf5130dbec22c8bc58f
---
 src/account/migrations/0002_auto_20180109_2002.py | 33 -----------------------
 src/account/migrations/0002_auto_20180110_1636.py | 33 +++++++++++++++++++++++
 src/account/migrations/0003_auto_20180110_1639.py | 24 +++++++++++++++++
 3 files changed, 57 insertions(+), 33 deletions(-)
 delete mode 100644 src/account/migrations/0002_auto_20180109_2002.py
 create mode 100644 src/account/migrations/0002_auto_20180110_1636.py
 create mode 100644 src/account/migrations/0003_auto_20180110_1639.py

(limited to 'src/account/migrations')

diff --git a/src/account/migrations/0002_auto_20180109_2002.py b/src/account/migrations/0002_auto_20180109_2002.py
deleted file mode 100644
index 5cf8a70..0000000
--- a/src/account/migrations/0002_auto_20180109_2002.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2018-01-09 20:02
-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),
-        ('account', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Lab',
-            fields=[
-                ('id', models.AutoField(primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=200, unique=True)),
-                ('contact_email', models.EmailField(blank=True, max_length=200, null=True)),
-                ('contact_phone', models.CharField(blank=True, max_length=20, null=True)),
-                ('lab_user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='userprofile',
-            name='email_addr',
-            field=models.CharField(default='email@mail.com', max_length=300),
-        ),
-    ]
diff --git a/src/account/migrations/0002_auto_20180110_1636.py b/src/account/migrations/0002_auto_20180110_1636.py
new file mode 100644
index 0000000..6170acb
--- /dev/null
+++ b/src/account/migrations/0002_auto_20180110_1636.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2018-01-10 16:36
+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),
+        ('account', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Lab',
+            fields=[
+                ('id', models.CharField(max_length=200, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=200, unique=True)),
+                ('contact_email', models.EmailField(blank=True, max_length=200, null=True)),
+                ('contact_phone', models.CharField(blank=True, max_length=20, null=True)),
+                ('lab_user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='email_addr',
+            field=models.CharField(default='email@mail.com', max_length=300),
+        ),
+    ]
diff --git a/src/account/migrations/0003_auto_20180110_1639.py b/src/account/migrations/0003_auto_20180110_1639.py
new file mode 100644
index 0000000..d0bc4d6
--- /dev/null
+++ b/src/account/migrations/0003_auto_20180110_1639.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2018-01-10 16:39
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0002_auto_20180110_1636'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='lab',
+            name='id',
+        ),
+        migrations.AlterField(
+            model_name='lab',
+            name='name',
+            field=models.CharField(max_length=200, primary_key=True, serialize=False, unique=True),
+        ),
+    ]
-- 
cgit 1.2.3-korg