diff options
author | maxbr <maxbr@mi.fu-berlin.de> | 2016-10-05 14:24:11 +0200 |
---|---|---|
committer | Jose Lausuch <jose.lausuch@ericsson.com> | 2016-10-12 13:29:04 +0000 |
commit | adafb09cb1f221259970d16886ea0e03169899a5 (patch) | |
tree | d282c9c67723a4f5247909256396bbfd1d957335 /pharos-dashboard/src/dashboard | |
parent | 46e1d9ab232df1c4deb672b72cd7b87081094955 (diff) |
Sync dashboard user data with jira
JIRA: PHAROS-264
Change-Id: Ic4533af04946ee0493c762ca79aaf46ee0f80e00
Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
Diffstat (limited to 'pharos-dashboard/src/dashboard')
-rw-r--r-- | pharos-dashboard/src/dashboard/migrations/0002_auto_20161005_1202.py | 21 | ||||
-rw-r--r-- | pharos-dashboard/src/dashboard/models.py | 2 |
2 files changed, 22 insertions, 1 deletions
diff --git a/pharos-dashboard/src/dashboard/migrations/0002_auto_20161005_1202.py b/pharos-dashboard/src/dashboard/migrations/0002_auto_20161005_1202.py new file mode 100644 index 0000000..e47c3b1 --- /dev/null +++ b/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/pharos-dashboard/src/dashboard/models.py b/pharos-dashboard/src/dashboard/models.py index 050834e..e3f22e6 100644 --- a/pharos-dashboard/src/dashboard/models.py +++ b/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): |