git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9d8fc9e
)
Don't use config backend type if it's not set
author
Sapan Bhatia
<gwsapan@gmail.com>
Tue, 23 Sep 2014 17:42:23 +0000
(13:42 -0400)
committer
Sapan Bhatia
<gwsapan@gmail.com>
Tue, 23 Sep 2014 17:42:23 +0000
(13:42 -0400)
planetstack/core/models/site.py
patch
|
blob
|
history
diff --git
a/planetstack/core/models/site.py
b/planetstack/core/models/site.py
index
af57ed2
..
33d9437
100644
(file)
--- 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):
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
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:
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
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:
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
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:
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:
else:
- 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))
# deprecated in django 1.7 in favor of get_queryset().
def get_query_set(self):
# deprecated in django 1.7 in favor of get_queryset().
def get_query_set(self):