refactor

[plstackapi.git] / plstackapi / core / admin.py

diff --git a/plstackapi/core/admin.py b/plstackapi/core/admin.py
index 363f7e7..2365225 100644 (file)
--- a/plstackapi/core/admin.py
+++ b/plstackapi/core/admin.py
@@ -30,8 +30,10 @@ class ReadonlyTabularInline(admin.TabularInline):
 
 class SliverInline(admin.TabularInline):
     model = Sliver
-    fields = ['ip', 'name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']
+    fields = ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']
     extra = 0
+    #readonly_fields = ['ip', 'instance_name', 'image']
+    readonly_fields = ['ip', 'instance_name']
 
 class SiteInline(admin.TabularInline):
     model = Site
@@ -59,7 +61,7 @@ class PlainTextWidget(forms.HiddenInput):
     def render(self, name, value, attrs=None):
         if value is None:
             value = ''
-        return mark_safe(value + super(PlainTextWidget, self).render(name, value, attrs))
+        return mark_safe(str(value) + super(PlainTextWidget, self).render(name, value, attrs))
 
 class PlanetStackBaseAdmin(admin.ModelAdmin):
     save_on_top = False
@@ -175,9 +177,9 @@ class SitePrivilegeAdmin(PlanetStackBaseAdmin):
 
 class KeyAdmin(OSModelAdmin):
     fieldsets = [
-        ('Key', {'fields': ['name', 'key', 'type', 'blacklisted', 'user']})
+        ('Key', {'fields': ['key', 'type', 'blacklisted', 'user']})
     ]
-    list_display = ['name', 'key', 'type', 'blacklisted', 'user']
+    list_display = ['key', 'type', 'blacklisted', 'user']
 
     def get_queryset(self, request):
         # get keys user is allowed to see
@@ -187,7 +189,6 @@ class KeyAdmin(OSModelAdmin):
         # users can only see their own keys
         return qs.filter(user=request.user)  
         
-
 class SliceAdmin(OSModelAdmin):
     fields = ['name', 'site', 'serviceClass', 'description', 'slice_url']
     list_display = ('name', 'site','serviceClass', 'slice_url')
@@ -242,9 +243,9 @@ class NodeAdmin(admin.ModelAdmin):
 
 class SliverForm(forms.ModelForm):
     class Meta:
+        model = Sliver
         ip = forms.CharField(widget=PlainTextWidget)
         instance_name = forms.CharField(widget=PlainTextWidget)
-        model = Sliver
         widgets = {
             'ip': PlainTextWidget(),
             'instance_name': PlainTextWidget(),
@@ -257,6 +258,24 @@ class SliverAdmin(PlanetStackBaseAdmin):
     ]
     list_display = ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']
 
+    def get_formsets(self, request, obj=None):
+        # make some fields read only if we are updating an existing record
+        if obj == None:
+            #self.readonly_fields = ('ip', 'instance_name') 
+            self.readonly_fields = () 
+        else:
+            self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key') 
+
+        for inline in self.get_inline_instances(request, obj):
+            # hide MyInline in the add view
+            if obj is None:
+                continue
+            # give inline object access to driver and caller
+            auth = request.session.get('auth', {})
+            auth['tenant'] = obj.name       # meed to connect using slice's tenant
+            inline.model.os_manager = OpenStackManager(auth=auth, caller=request.user)
+            yield inline.get_formset(request, obj)
+
     def save_model(self, request, obj, form, change):
         # update openstack connection to use this site/tenant
         auth = request.session.get('auth', {})
@@ -327,17 +346,17 @@ class PLUserAdmin(UserAdmin, OSModelAdmin):
     # The fields to be used in displaying the User model.
     # These override the definitions on the base UserAdmin
     # that reference specific fields on auth.User.
-    list_display = ('email', 'site', 'firstname', 'lastname', 'last_login')
+    list_display = ('email', 'site', 'firstname', 'lastname', 'is_admin', 'last_login')
     list_filter = ('site',)
     fieldsets = (
         (None, {'fields': ('email', 'password')}),
-        ('Personal info', {'fields': ('firstname','lastname','phone','site')}),
+        ('Personal info', {'fields': ('firstname','lastname','phone', 'is_admin', 'site')}),
         #('Important dates', {'fields': ('last_login',)}),
     )
     add_fieldsets = (
         (None, {
             'classes': ('wide',),
-            'fields': ('email', 'firstname', 'lastname', 'phone', 'site', 'password1', 'password2')}
+            'fields': ('email', 'firstname', 'lastname', 'phone', 'site', 'is_admin', 'password1', 'password2')}
         ),
     )
     search_fields = ('email',)
@@ -361,7 +380,6 @@ admin.site.register(Site, SiteAdmin)
 admin.site.register(SitePrivilege, SitePrivilegeAdmin)
 admin.site.register(Slice, SliceAdmin)
 admin.site.register(SliceMembership, SliceMembershipAdmin)
-admin.site.register(Image, ImageAdmin)
 admin.site.register(Node, NodeAdmin)
 admin.site.register(Sliver, SliverAdmin)
 admin.site.register(Key, KeyAdmin)