X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fmodels%2Fsite.py;h=67f38aa3676228fa393ac4172778f20991f69b89;hb=97b2edbd635eaec01e33030b18e7ce2ca96c530f;hp=af57ed24c87840ca63395b0722030d9a51e69d2d;hpb=9d8fc9ee70f829785442ecaf94589ef2c631766d;p=plstackapi.git diff --git a/planetstack/core/models/site.py b/planetstack/core/models/site.py index af57ed2..67f38aa 100644 --- a/planetstack/core/models/site.py +++ b/planetstack/core/models/site.py @@ -20,7 +20,7 @@ class DeploymentLinkDeletionManager(PlCoreBaseDeletionManager): parent_queryset = parent.get_queryset() if hasattr(parent, "get_queryset") else parent.get_query_set() if (backend_type): - return parent_queryset.filter(Q(deployment__backend_type=config.observer_backend_type)|Q(backend_type=None)) + return parent_queryset.filter(Q(deployment__backend_type=backend_type)|Q(backend_type=None)) else: return parent_queryset @@ -41,7 +41,7 @@ class DeploymentDeletionManager(PlCoreBaseDeletionManager): parent_queryset = parent.get_queryset() if hasattr(parent, "get_queryset") else parent.get_query_set() if backend_type: - return parent_queryset.filter(Q(backend_type=config.observer_backend_type)|Q(backend_type=None)) + return parent_queryset.filter(Q(backend_type=backend_type)|Q(backend_type=None)) else: return parent_queryset @@ -61,7 +61,7 @@ class DeploymentLinkManager(PlCoreBaseManager): parent_queryset = parent.get_queryset() if hasattr(parent, "get_queryset") else parent.get_query_set() if backend_type: - return parent_queryset.filter(Q(deployment__backend_type=config.observer_backend_type)|Q(backend_type=None)) + return parent_queryset.filter(Q(deployment__backend_type=backend_type)|Q(backend_type=None)) else: return parent_queryset @@ -82,9 +82,9 @@ class DeploymentManager(PlCoreBaseManager): parent_queryset = parent.get_queryset() if hasattr(parent, "get_queryset") else parent.get_query_set() if backend_type: - return parent_queryset.filter(Q(backend_type=config.observer_backend_type)|Q(backend_type=None)) + return parent_queryset.filter(Q(backend_type=backend_type)|Q(backend_type=None)) else: - return parent_queryset.filter(Q(backend_type=config.observer_backend_type)|Q(backend_type=None)) + return parent_queryset # deprecated in django 1.7 in favor of get_queryset(). def get_query_set(self): @@ -220,8 +220,8 @@ class Deployment(PlCoreBase): return Deployment.objects.all() class DeploymentRole(PlCoreBase): - objects = DeploymentLinkManager() - deleted_objects = DeploymentLinkDeletionManager() + #objects = DeploymentLinkManager() + #deleted_objects = DeploymentLinkDeletionManager() ROLE_CHOICES = (('admin','Admin'),) role = models.CharField(choices=ROLE_CHOICES, unique=True, max_length=30)