From d4d63f63f1ab4cd636499adee319f2a0b8513020 Mon Sep 17 00:00:00 2001 From: maxbr Date: Fri, 5 May 2017 10:02:56 +0200 Subject: Pharos Dashboard: Add manual resource management Dev Pods are now managed by checking the "Dev pod" box in the Admin Panel. This commit also fixes a dead image URL and the oauth process for the dashboard URL. Change-Id: Ic94160eb3a4504a369606261440df0e5354ac027 Signed-off-by: maxbr --- tools/pharos-dashboard/src/dashboard/models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools/pharos-dashboard/src/dashboard/models.py') diff --git a/tools/pharos-dashboard/src/dashboard/models.py b/tools/pharos-dashboard/src/dashboard/models.py index 4f3ac95c..3de7db3d 100644 --- a/tools/pharos-dashboard/src/dashboard/models.py +++ b/tools/pharos-dashboard/src/dashboard/models.py @@ -22,9 +22,10 @@ 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) - owner = models.ForeignKey(User, related_name='user_lab_owner', null=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) + slave = models.ForeignKey(JenkinsSlave, on_delete=models.DO_NOTHING, null=True, blank=True) + dev_pod = models.BooleanField(default=False) def get_booking_utilization(self, weeks): """ -- cgit 1.2.3-korg