Limit total number of active bookings per user

[pharos-tools.git] / dashboard / src / workflow / sw_bundle_workflow.py

diff --git a/dashboard/src/workflow/sw_bundle_workflow.py b/dashboard/src/workflow/sw_bundle_workflow.py
index 1695b65..fd41018 100644 (file)
--- a/dashboard/src/workflow/sw_bundle_workflow.py
+++ b/dashboard/src/workflow/sw_bundle_workflow.py
@@ -20,16 +20,9 @@ from resource_inventory.models import Image, GenericHost, ConfigBundle, HostConf
 class SWConf_Resource_Select(Resource_Select):
     def __init__(self, *args, **kwargs):
         super(SWConf_Resource_Select, self).__init__(*args, **kwargs)
-        self.repo_key = self.repo.SWCONF_SELECTED_GRB
+        self.repo_key = self.repo.SELECTED_GRESOURCE_BUNDLE
         self.confirm_key = "configuration"
 
-    def get_default_entry(self):
-        booking_grb = self.repo_get(self.repo.BOOKING_SELECTED_GRB)
-        if booking_grb:
-            return booking_grb
-        created_grb = self.repo_get(self.repo.GRESOURCE_BUNDLE_MODELS, {}).get("bundle", None)
-        return created_grb
-
     def post_render(self, request):
         response = super(SWConf_Resource_Select, self).post_render(request)
         models = self.repo_get(self.repo.CONFIG_MODELS, {})
@@ -79,8 +72,8 @@ class Define_Software(WorkflowStep):
                         host_profile = host.profile
                         break
             excluded_images = Image.objects.exclude(owner=user).exclude(public=True)
-            excluded_images = excluded_images | Image.objects.exclude(host_type=host.profile)
-            lab = self.repo_get(self.repo.SWCONF_SELECTED_GRB).lab
+            excluded_images = excluded_images | Image.objects.exclude(host_type=host_profile)
+            lab = self.repo_get(self.repo.SELECTED_GRESOURCE_BUNDLE).lab
             excluded_images = excluded_images | Image.objects.exclude(from_lab=lab)
             filter_data["id_form-" + str(i) + "-image"] = []
             for image in excluded_images:
@@ -91,7 +84,7 @@ class Define_Software(WorkflowStep):
 
     def get_host_list(self, grb=None):
         if grb is None:
-            grb = self.repo_get(self.repo.SWCONF_SELECTED_GRB, False)
+            grb = self.repo_get(self.repo.SELECTED_GRESOURCE_BUNDLE, False)
             if not grb:
                 return []
         if grb.id:
@@ -102,7 +95,7 @@ class Define_Software(WorkflowStep):
     def get_context(self):
         context = super(Define_Software, self).get_context()
 
-        grb = self.repo_get(self.repo.SWCONF_SELECTED_GRB, False)
+        grb = self.repo_get(self.repo.SELECTED_GRESOURCE_BUNDLE, False)
 
         if grb:
             context["grb"] = grb
@@ -135,7 +128,7 @@ class Define_Software(WorkflowStep):
                 i += 1
                 image = form.cleaned_data['image']
                 # checks image compatability
-                grb = self.repo_get(self.repo.SWCONF_SELECTED_GRB)
+                grb = self.repo_get(self.repo.SELECTED_GRESOURCE_BUNDLE)
                 lab = None
                 if grb:
                     lab = grb.lab
@@ -145,7 +138,7 @@ class Define_Software(WorkflowStep):
                     q.filter(host_type=host.profile)
                     q.filter(from_lab=lab)
                     q.get(id=image.id)  # will throw exception if image is not in q
-                except:
+                except Exception:
                     self.metastep.set_invalid("Image " + image.name + " is not compatible with host " + host.resource.name)
                 role = form.cleaned_data['role']
                 if "jumphost" in role.name.lower():