X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=ea86f4be8c0a65cf90bac8fb920450149ebf2fc6;hb=2ab61bbb27e55c20f40e502f32730dac386e7e22;hp=8c9e05021cdce2aaf58c38f03888bd0b94e8249e;hpb=8b6085640cd973c327145b0acd4f7db08489e278;p=plstackapi.git

diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index 8c9e050..ea86f4b 100644
--- a/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@ -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.sites.all()]
+        self.fields['sites'].initial = [x for x in self.instance.sitesdeployments.all()]
         self.fields['images'].initial = [x.image for x in self.instance.imagedeployments.all()]
         self.fields['flavors'].initial = self.instance.flavors.all()
 
@@ -669,7 +669,7 @@ class ControllerAdminForm(forms.ModelForm):
         super(ControllerAdminForm, self).__init__(*args, **kwargs)  
 
         if self.instance and self.instance.pk:
-            self.fields['sites'].initial = [x.site_deployment for x in self.instance.controllersite.all()]
+            self.fields['sites'].initial = [x.site for x in self.instance.controllersite.all()]
 
     def manipulate_m2m_objs(self, this_obj, selected_objs, all_relations, relation_class, local_attrname, foreign_attrname):
         """ helper function for handling m2m relations from the MultipleChoiceField
@@ -784,7 +784,7 @@ class SiteAdmin(PlanetStackBaseAdmin):
     list_display_links = ('backend_status_icon', 'name', )
     filter_horizontal = ('deployments',)
     inlines = [SliceInline,UserInline,TagInline, SitePrivilegeInline, SiteDeploymentInline]
-    admin_inlines = [ControllerSite]
+    admin_inlines = [ControllerSiteInline]
     search_fields = ['name']
 
     @property