X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=134b6884a722c8e7cb0aa6ae2746dffd18159da9;hb=1e88946bc9fa4ff8b921143c354a901d686cd5a6;hp=a4295205c86a6d30e76f731986ae5fce87338700;hpb=47ae1b51a8639f63e2a9785126dbd7b87fe99d66;p=plstackapi.git

diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index a429520..134b688 100644
--- a/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@ -337,7 +337,8 @@ class SliverAdmin(PlanetStackBaseAdmin):
             #self.readonly_fields = ('ip', 'instance_name') 
             self.readonly_fields = () 
         else:
-            self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key') 
+            self.readonly_fields = () 
+            #self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key') 
 
         for inline in self.get_inline_instances(request, obj):
             # hide MyInline in the add view
@@ -423,20 +424,31 @@ class UserAdmin(UserAdmin, OSModelAdmin):
     list_filter = ('site',)
     inlines = [SitePrivilegeInline, SliceMembershipInline]
     fieldsets = (
-        (None, {'fields': ('email', 'password', 'site')}),
+        (None, {'fields': ('email', 'password', 'site', 'is_admin')}),
         ('Personal info', {'fields': ('firstname','lastname','phone', 'key')}),
         #('Important dates', {'fields': ('last_login',)}),
     )
     add_fieldsets = (
         (None, {
             'classes': ('wide',),
-            'fields': ('email', 'firstname', 'lastname', 'phone', 'site', 'key','password1', 'password2')}
+            'fields': ('email', 'firstname', 'lastname', 'phone', 'site', 'key','password1', 'password2', 'is_admin')}
         ),
     )
     search_fields = ('email',)
     ordering = ('email',)
     filter_horizontal = ()
 
+class ServiceResourceInline(admin.TabularInline):
+    model = ServiceResource
+    extra = 0
+
+class ServiceClassAdmin(admin.ModelAdmin):
+    list_display = ('name', 'commitment', 'membershipFee')
+    inlines = [ServiceResourceInline]
+
+class ServiceResourceAdmin(admin.ModelAdmin):
+    list_display = ('serviceClass', 'name', 'cost', 'calendarReservable', 'maxUnitsDeployment', 'maxUnitsNode')
+
 # register a signal that caches the user's credentials when they log in
 def cache_credentials(sender, user, request, **kwds):
     auth = {'username': request.POST['username'],
@@ -461,4 +473,6 @@ admin.site.register(Sliver, SliverAdmin)
 admin.site.register(Key, KeyAdmin)
 admin.site.register(Role, RoleAdmin)
 admin.site.register(DeploymentNetwork, DeploymentNetworkAdmin)
+admin.site.register(ServiceClass, ServiceClassAdmin)
+admin.site.register(ServiceResource, ServiceResourceAdmin)