diff options
author | Sawyer Bergeron <sbergeron@iol.unh.edu> | 2020-05-15 14:58:37 -0400 |
---|---|---|
committer | Sawyer Bergeron <sbergeron@iol.unh.edu> | 2020-05-15 17:42:23 -0400 |
commit | 530271c247a4ce538e3aa69fd3893481fada44ab (patch) | |
tree | 48640138c825bf0906a1c261c28939d5311ae6d6 /src/account | |
parent | 6bf37e9864787e0398a1d2e1cdd10b40a8ebc6e6 (diff) |
Merge resource branch
This pulls master up to date to include
changes to models and surrounding infra that allow
for multi-node templates and merging of pods
Squashed commit of the following:
commit abc8f27d9c6b05fb3afcb9b00dc35c0f2232d1a6
Author: Sawyer Bergeron <sawyerbergeron@gmail.com>
Date: Thu Apr 2 14:05:26 2020 -0400
Start fixing workflow for model changes
Change-Id: I79df975ef45abf2e6e69594d358bbd205938828f
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.com>
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
commit 7a7e2182acd0ea94e19aba4926c3a12771b30a6d
Author: sms1097 <ssmith@iol.unh.edu>
Date: Tue Mar 31 15:13:06 2020 -0400
Working on workflow refactoring
Change-Id: I4141b6aca98aff7bff9cb78a7d5594e25eb45e98
Signed-off-by: Sean Smith <ssmith@iol.unh.edu>
commit c09050ae2814f07af58557b40f9ed3559063d2c7
Merge: 71438d9 b5ccdc4
Author: Parker Berberian <pberberian@iol.unh.edu>
Date: Tue Mar 24 20:34:16 2020 +0000
Merge "Able to delete configurations and view lab details" into resource
commit b5ccdc4ffbb883c20f2f6f69aeef5002aef5db53
Author: sms1097 <ssmith@iol.unh.edu>
Date: Thu Mar 19 17:08:12 2020 -0400
Able to delete configurations and view lab details
Change-Id: Ib15c86d84f4cc7e7745551889ce91c89b5de46e2
Signed-off-by: Sean Smith <ssmith@iol.unh.edu>
Change-Id: Id6748c6bea67773a861921394d88579730246598
commit 71438d9a35cdb316cece865c9d410aeffb0053d8
Merge: 5460d0d a758223
Author: Parker Berberian <pberberian@iol.unh.edu>
Date: Thu Mar 19 18:51:09 2020 +0000
Merge "Add / Fix tests for refactor" into resource
commit 5460d0d447b075433a763f9bfa33448b88ec8393
Merge: a9063a3 f55d839
Author: Parker Berberian <pberberian@iol.unh.edu>
Date: Wed Mar 18 15:59:37 2020 +0000
Merge "Fixed the quick booking form resource template filtering. Added some more models to the admin page." into resource
commit f55d839a029ab1f5ab1273872e71a97fa1d5108b
Author: Adam Hassick <ahassick@iol.unh.edu>
Date: Tue Mar 17 11:35:40 2020 -0400
Fixed the quick booking form resource template filtering. Added some more models to the admin page.
Signed-off-by: Adam Hassick <ahassick@iol.unh.edu>
Change-Id: I2d2e7aeb96b10c231804a62f37a476039c954b7b
commit a9063a347c4ebef0e53a17f198468bb135772810
Author: Parker Berberian <pberberian@iol.unh.edu>
Date: Wed Mar 18 10:29:51 2020 -0400
Fixes Some Issues with Quick Booking Seen in the Akraino lab
Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
Change-Id: I2a1e843fbaa7984225f2f80742dad59dc348fbf2
commit a758223f44c6fec595b055d7c9b232b00e9174a0
Author: Parker Berberian <pberberian@iol.unh.edu>
Date: Tue Mar 17 11:07:32 2020 -0400
Add / Fix tests for refactor
Change-Id: I0526d1942f87707082a4eb1c8c98910f84481c23
Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
Author: Parker Berberian <pberberian@iol.unh.edu>
Add "Pod" Column to booking list
Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
Change-Id: I270913283bf1e5815cadf622ba2fd5f98bb61675
Author: Parker Berberian <pberberian@iol.unh.edu>
Fixes that make the Akraino dashboard work
Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
Change-Id: I81746473a4511ef7d46445a7b16809a6e9da100f
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Change-Id: I4b428e7c8a8d401d7bae95cba01077feb0332a7f
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Diffstat (limited to 'src/account')
-rw-r--r-- | src/account/views.py | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/account/views.py b/src/account/views.py index a8bb02b..d1cc813 100644 --- a/src/account/views.py +++ b/src/account/views.py @@ -29,6 +29,7 @@ from django.shortcuts import render from jira import JIRA from rest_framework.authtoken.models import Token + from account.forms import AccountSettingsForm from account.jira_util import SignatureMethod_RSA_SHA1 from account.models import UserProfile @@ -177,20 +178,15 @@ def account_resource_view(request): if not request.user.is_authenticated: return render(request, "dashboard/login.html", {'title': 'Authentication Required'}) template = "account/resource_list.html" - resources = ResourceTemplate.objects.filter( - owner=request.user).prefetch_related("configbundle_set") - mapping = {} - resource_list = [] - booking_mapping = {} - for grb in resources: - resource_list.append(grb) - mapping[grb.id] = [{"id": x.id, "name": x.name} for x in grb.configbundle_set.all()] - if Booking.objects.filter(resource__template=grb, end__gt=timezone.now()).exists(): - booking_mapping[grb.id] = "true" + + active_bundles = [book.resource for book in Booking.objects.filter( + owner=request.user, end__gte=timezone.now())] + active_resources = [bundle.template.id for bundle in active_bundles] + resource_list = list(ResourceTemplate.objects.filter(owner=request.user)) + context = { "resources": resource_list, - "grb_mapping": mapping, - "booking_mapping": booking_mapping, + "active_resources": active_resources, "title": "My Resources" } return render(request, template, context=context) @@ -260,7 +256,7 @@ def configuration_delete_view(request, config_id=None): config = get_object_or_404(ResourceTemplate, pk=config_id) if not request.user.id == config.owner.id: return HttpResponse('no') # 403? - if Booking.objects.filter(config_bundle=config, end__gt=timezone.now()).exists(): + if Booking.objects.filter(resource__template=config, end__gt=timezone.now()).exists(): return HttpResponse('no') config.delete() return HttpResponse('') |