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:
6cdfad4
)
first cut on ImageDeployments addable by UI
author
Scott Baker
<smbaker@gmail.com>
Wed, 11 Jun 2014 18:34:44 +0000
(11:34 -0700)
committer
Scott Baker
<smbaker@gmail.com>
Wed, 11 Jun 2014 18:34:44 +0000
(11:34 -0700)
planetstack/core/admin.py
patch
|
blob
|
history
diff --git
a/planetstack/core/admin.py
b/planetstack/core/admin.py
index
0e38d43
..
c173cb1
100644
(file)
--- a/
planetstack/core/admin.py
+++ b/
planetstack/core/admin.py
@@
-432,14
+432,22
@@
class SliceNetworkInline(PlStackTabularInline):
suit_classes = 'suit-tab suit-tab-slicenetworks'
fields = ['network']
suit_classes = 'suit-tab suit-tab-slicenetworks'
fields = ['network']
+class ImageDeploymentsROInline(ReadOnlyTabularInline):
+ model = ImageDeployments
+ extra = 0
+ verbose_name = "Image Deployments"
+ verbose_name_plural = "Image Deployments"
+ suit_classes = 'suit-tab suit-tab-imagedeployments'
+ fields = ['image', 'deployment', 'glance_image_id']
+
class ImageDeploymentsInline(PlStackTabularInline):
model = ImageDeployments
extra = 0
verbose_name = "Image Deployments"
verbose_name_plural = "Image Deployments"
suit_classes = 'suit-tab suit-tab-imagedeployments'
class ImageDeploymentsInline(PlStackTabularInline):
model = ImageDeployments
extra = 0
verbose_name = "Image Deployments"
verbose_name_plural = "Image Deployments"
suit_classes = 'suit-tab suit-tab-imagedeployments'
- fields = ['deployment', 'glance_image_id']
- readonly_fields = ['
deployment', '
glance_image_id']
+ fields = ['
image', '
deployment', 'glance_image_id']
+ readonly_fields = ['glance_image_id']
class PlainTextWidget(forms.HiddenInput):
input_type = 'hidden'
class PlainTextWidget(forms.HiddenInput):
input_type = 'hidden'
@@
-539,12
+547,12
@@
class DeploymentAdmin(PlanetStackBaseAdmin):
model = Deployment
fieldList = ['name','sites', 'accessControl']
fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-sites']})]
model = Deployment
fieldList = ['name','sites', 'accessControl']
fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-sites']})]
- inlines = [DeploymentPrivilegeInline,NodeInline,TagInline]
+ inlines = [DeploymentPrivilegeInline,NodeInline,TagInline
,ImageDeploymentsInline
]
- user_readonly_inlines = [DeploymentPrivilegeROInline,NodeROInline,TagROInline]
+ user_readonly_inlines = [DeploymentPrivilegeROInline,NodeROInline,TagROInline
,ImageDeploymentsROInline
]
user_readonly_fields = ['name']
user_readonly_fields = ['name']
- suit_form_tabs =(('sites','Deployment Details'),('nodes','Nodes'),('deploymentprivileges','Privileges'),('tags','Tags'))
+ suit_form_tabs =(('sites','Deployment Details'),('nodes','Nodes'),('deploymentprivileges','Privileges'),('tags','Tags')
,('imagedeployments','Images')
)
def get_form(self, request, obj=None, **kwargs):
if request.user.isReadOnlyUser():
def get_form(self, request, obj=None, **kwargs):
if request.user.isReadOnlyUser():
@@
-789,9
+797,9
@@
class ImageAdmin(PlanetStackBaseAdmin):
suit_form_tabs =(('general','Image Details'),('slivers','Slivers'),('imagedeployments','Deployments'))
inlines = [SliverInline, ImageDeploymentsInline]
suit_form_tabs =(('general','Image Details'),('slivers','Slivers'),('imagedeployments','Deployments'))
inlines = [SliverInline, ImageDeploymentsInline]
-
+
user_readonly_fields = ['name', 'disk_format', 'container_format']
user_readonly_fields = ['name', 'disk_format', 'container_format']
- user_readonly_inlines = [SliverROInline]
+ user_readonly_inlines = [SliverROInline
, ImageDeploymentsROInline
]
class NodeForm(forms.ModelForm):
class Meta:
class NodeForm(forms.ModelForm):
class Meta: