X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=20fd00064235632124de30cd552e6c59f886b65f;hb=451c4fc73c5fbb698af6e67e9488c1e7d167d209;hp=1debeb077ca35f8a7629ae48adad0502e4513c1c;hpb=fe290f49559b1e19b9251b83877862f70679bf86;p=plstackapi.git
diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index 1debeb0..20fd000 100644
--- a/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@ -31,7 +31,7 @@ def backend_icon(obj): # backend_status, enacted, updated):
if (obj.enacted is not None) and obj.enacted >= obj.updated:
return '
'
else:
- if obj.backend_status == "Provisioning in progress" or obj.backend_status=="":
+ if ((obj.backend_status is not None) and obj.backend_status.startswith("0 -")) or obj.backend_status == "Provisioning in progress" or obj.backend_status=="":
return '
' % obj.backend_status
else:
return '
' % html_escape(obj.backend_status, quote=True)
@@ -542,7 +542,7 @@ class DeploymentAdminForm(forms.ModelForm):
self.fields['accessControl'].initial = "allow site " + request.user.site.name
if self.instance and self.instance.pk:
- self.fields['sites'].initial = [x for x in self.instance.sitesdeployments.all()]
+ self.fields['sites'].initial = [x.site for x in self.instance.sitedeployments.all()]
self.fields['images'].initial = [x.image for x in self.instance.imagedeployments.all()]
self.fields['flavors'].initial = self.instance.flavors.all()
@@ -594,7 +594,7 @@ class DeploymentAdminForm(forms.ModelForm):
# create/destroy the through models ourselves. There has to be
# a better way...
- self.manipulate_m2m_objs(deployment, self.cleaned_data['sites'], deployment.sitedeployment.all(), SiteDeployment, "deployment", "site")
+ self.manipulate_m2m_objs(deployment, self.cleaned_data['sites'], deployment.sitedeployments.all(), SiteDeployment, "deployment", "site")
self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments.all(), ImageDeployments, "deployment", "image")
# manipulate_m2m_objs doesn't work for Flavor/Deployment relationship
# so well handle that manually here
@@ -958,7 +958,7 @@ class SliceAdmin(PlanetStackBaseAdmin):
def render_change_form(self, request, context, add=False, change=False, form_url='', obj=None):
deployment_nodes = []
for node in Node.objects.all():
- deployment_nodes.append( (node.site_deployment.id, node.id, node.name) )
+ deployment_nodes.append( (node.site_deployment.deployment.id, node.id, node.name) )
deployment_flavors = []
for flavor in Flavor.objects.all():