summaryrefslogtreecommitdiffstats
path: root/src/dashboard
diff options
context:
space:
mode:
authorSawyer Bergeron <sbergeron@iol.unh.edu>2018-01-10 11:44:23 -0500
committerSawyer Bergeron <sbergeron@iol.unh.edu>2018-01-17 21:42:33 +0000
commitdedc82d564993139f72102e3d2330f2fb64b1244 (patch)
tree38a986b6355b377f0d0cb8aa460122cab6071060 /src/dashboard
parenta1df798486c60c911dfb2e6c2c487f7bcb7f6d01 (diff)
Add Nullable Lab Field to Resources
Jira: PHAROS-347 Resources are now possible to associate with lab instances upon creation Change-Id: Id8abbcc448a6d840d55e4bf5130dbec22c8bc58f
Diffstat (limited to 'src/dashboard')
-rw-r--r--src/dashboard/migrations/0003_resource_resource_lab.py22
-rw-r--r--src/dashboard/models.py2
2 files changed, 24 insertions, 0 deletions
diff --git a/src/dashboard/migrations/0003_resource_resource_lab.py b/src/dashboard/migrations/0003_resource_resource_lab.py
new file mode 100644
index 0000000..fff93fd
--- /dev/null
+++ b/src/dashboard/migrations/0003_resource_resource_lab.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2018-01-10 16:36
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('account', '0002_auto_20180110_1636'),
+ ('dashboard', '0002_auto_20170505_0815'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='resource',
+ name='resource_lab',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='lab_resource_set', to='account.Lab'),
+ ),
+ ]
diff --git a/src/dashboard/models.py b/src/dashboard/models.py
index 3de7db3..ff55232 100644
--- a/src/dashboard/models.py
+++ b/src/dashboard/models.py
@@ -15,6 +15,7 @@ from django.db import models
from django.utils import timezone
from jenkins.models import JenkinsSlave
+from account.models import Lab
class Resource(models.Model):
@@ -22,6 +23,7 @@ class Resource(models.Model):
name = models.CharField(max_length=100, unique=True)
description = models.CharField(max_length=300, blank=True, null=True)
url = models.CharField(max_length=100, blank=True, null=True)
+ resource_lab = models.ForeignKey(Lab, related_name='lab_resource_set', null=True, blank=True)
owner = models.ForeignKey(User, related_name='user_lab_owner', null=True, blank=True)
vpn_users = models.ManyToManyField(User, related_name='user_vpn_users', blank=True)
slave = models.ForeignKey(JenkinsSlave, on_delete=models.DO_NOTHING, null=True, blank=True)