diff options
| author |   Parker Berberian <pberberian@iol.unh.edu> | 2019-11-12 15:21:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-11-12 15:21:05 +0000 |
| commit | f1d7b9300fbb06495c6087f975cdbb68a894da37 (patch) | |
| tree | 199e79931f14cdc581e7e04b1c8a9c04e4fa5004 /src/workflow | |
| parent | 28bbaf66df33c82abdf0f24755a570813edd1bbf (diff) | |
| parent | 1c68f210bdbe231ef2d993e9bb85e543af3470f8 (diff) | |
Merge "Allow public marked grb and configs to be shown"
Diffstat (limited to 'src/workflow')
| -rw-r--r-- | src/workflow/booking_workflow.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/workflow/booking_workflow.py b/src/workflow/booking_workflow.py index 3698164..c96e1b9 100644 --- a/src/workflow/booking_workflow.py +++ b/src/workflow/booking_workflow.py @@ -15,6 +15,7 @@ from booking.models import Booking from workflow.models import WorkflowStep, AbstractSelectOrCreate from workflow.forms import ResourceSelectorForm, SWConfigSelectorForm, BookingMetaForm, OPNFVSelectForm from resource_inventory.models import GenericResourceBundle, ConfigBundle, OPNFVConfig +from django.db.models import Q """ @@ -43,7 +44,7 @@ class Abstract_Resource_Select(AbstractSelectOrCreate): def get_form_queryset(self): user = self.repo_get(self.repo.SESSION_USER) - qs = GenericResourceBundle.objects.filter(owner=user) + qs = GenericResourceBundle.objects.filter(Q(hidden=False) & (Q(owner=user) | Q(public=True))) return qs def get_page_context(self): @@ -82,7 +83,7 @@ class SWConfig_Select(AbstractSelectOrCreate): def get_form_queryset(self): user = self.repo_get(self.repo.SESSION_USER) grb = self.repo_get(self.repo.SELECTED_GRESOURCE_BUNDLE) - qs = ConfigBundle.objects.filter(owner=user).filter(bundle=grb) + qs = ConfigBundle.objects.filter(Q(hidden=False) & (Q(owner=user) | Q(public=True))).filter(bundle=grb) return qs def put_confirm_info(self, bundle): |