summaryrefslogtreecommitdiffstats
path: root/tools/pharos-dashboard/src/dashboard
diff options
context:
space:
mode:
Diffstat (limited to 'tools/pharos-dashboard/src/dashboard')
-rw-r--r--tools/pharos-dashboard/src/dashboard/migrations/0002_auto_20161005_1202.py21
-rw-r--r--tools/pharos-dashboard/src/dashboard/models.py2
2 files changed, 22 insertions, 1 deletions
diff --git a/tools/pharos-dashboard/src/dashboard/migrations/0002_auto_20161005_1202.py b/tools/pharos-dashboard/src/dashboard/migrations/0002_auto_20161005_1202.py
new file mode 100644
index 00000000..e47c3b13
--- /dev/null
+++ b/tools/pharos-dashboard/src/dashboard/migrations/0002_auto_20161005_1202.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-10-05 12:02
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('dashboard', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='resource',
+ name='vpn_users',
+ field=models.ManyToManyField(blank=True, related_name='user_vpn_users', to=settings.AUTH_USER_MODEL),
+ ),
+ ]
diff --git a/tools/pharos-dashboard/src/dashboard/models.py b/tools/pharos-dashboard/src/dashboard/models.py
index 050834ea..e3f22e69 100644
--- a/tools/pharos-dashboard/src/dashboard/models.py
+++ b/tools/pharos-dashboard/src/dashboard/models.py
@@ -23,7 +23,7 @@ class Resource(models.Model):
description = models.CharField(max_length=300, blank=True, null=True)
url = models.CharField(max_length=100, blank=True, null=True)
owner = models.ForeignKey(User, related_name='user_lab_owner', null=True)
- vpn_users = models.ManyToManyField(User, related_name='user_vpn_users')
+ vpn_users = models.ManyToManyField(User, related_name='user_vpn_users', blank=True)
slave = models.ForeignKey(JenkinsSlave, on_delete=models.DO_NOTHING, null=True)
def get_booking_utilization(self, weeks):