git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix filtering of deployments when adding slivers
[plstackapi.git]
/
planetstack
/
core
/
admin.py
diff --git
a/planetstack/core/admin.py
b/planetstack/core/admin.py
index
bc1bb0d
..
8bf7976
100644
(file)
--- a/
planetstack/core/admin.py
+++ b/
planetstack/core/admin.py
@@
-232,10
+232,10
@@
class SliverInline(PlStackTabularInline):
return Sliver.select_by_user(request.user)
def formfield_for_foreignkey(self, db_field, request=None, **kwargs):
return Sliver.select_by_user(request.user)
def formfield_for_foreignkey(self, db_field, request=None, **kwargs):
- field = super(SliverInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
-
if db_field.name == 'deploymentNetwork':
if db_field.name == 'deploymentNetwork':
- kwargs['queryset'] = Deployment.select_by_user(request.user)
+ kwargs['queryset'] = Deployment.select_by_acl(request.user)
+
+ field = super(SliverInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
return field
return field
@@
-319,13
+319,13
@@
class NodeROInline(ReadOnlyTabularInline):
model = Node
extra = 0
suit_classes = 'suit-tab suit-tab-nodes'
model = Node
extra = 0
suit_classes = 'suit-tab suit-tab-nodes'
- fields = ['name','deployment']
+ fields = ['name','deployment'
,'site'
]
class NodeInline(PlStackTabularInline):
model = Node
extra = 0
suit_classes = 'suit-tab suit-tab-nodes'
class NodeInline(PlStackTabularInline):
model = Node
extra = 0
suit_classes = 'suit-tab suit-tab-nodes'
- fields = ['name','deployment']
+ fields = ['name','deployment'
,'site'
]
class DeploymentPrivilegeROInline(ReadOnlyTabularInline):
model = DeploymentPrivilege
class DeploymentPrivilegeROInline(ReadOnlyTabularInline):
model = DeploymentPrivilege