Add Nullable Lab Field to Resources

Jira: PHAROS-347

Resources are now possible to associate with lab instances upon creation

Change-Id: Id8abbcc448a6d840d55e4bf5130dbec22c8bc58f

3 files changed, 27 insertions, 4 deletions

diff --git a/dashboard/src/account/migrations/0002_auto_20180109_2002.py b/dashboard/src/account/migrations/0002_auto_20180110_1636.py
index 5cf8a70..6170acb 100644
--- a/dashboard/src/account/migrations/0002_auto_20180109_2002.py
+++ b/dashboard/src/account/migrations/0002_auto_20180110_1636.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2018-01-09 20:02
+# Generated by Django 1.10 on 2018-01-10 16:36
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Lab',
             fields=[
-                ('id', models.AutoField(primary_key=True, serialize=False)),
+                ('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)),
diff --git a/dashboard/src/account/migrations/0003_auto_20180110_1639.py b/dashboard/src/account/migrations/0003_auto_20180110_1639.py
new file mode 100644
index 0000000..d0bc4d6
--- /dev/null
+++ b/dashboard/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),
+        ),
+    ]
diff --git a/dashboard/src/account/models.py b/dashboard/src/account/models.py
index 1e493b9..aad4c50 100644
--- a/dashboard/src/account/models.py
+++ b/dashboard/src/account/models.py
@@ -36,9 +36,8 @@ class UserProfile(models.Model):
         return self.user.username
 
 class Lab(models.Model):
-    id = models.AutoField(primary_key=True)
     lab_user = models.OneToOneField(User, on_delete=models.CASCADE)
-    name = models.CharField(max_length=200, unique=True, null=False, blank=False)
+    name = models.CharField(max_length=200, primary_key=True, unique=True, null=False, blank=False)
     contact_email = models.EmailField(max_length=200, null=True, blank=True)
     contact_phone = models.CharField(max_length=20, null=True, blank=True)