check-in fix for checkbox deletion not working in django 1.7
[plstackapi.git] / planetstack / core / admin.py
index d1f6f86..94e8453 100644 (file)
@@ -18,13 +18,22 @@ from django.core.urlresolvers import reverse, NoReverseMatch
 
 import django_evolution
 
-def backend_icon(value):
-        if value == "":
-            return ""
-        elif value == "Provisioning in progress":
-            return '<img src="/static/admin/img/icon_clock.gif">'
+def backend_icon(obj): # backend_status, enacted, updated):
+    #return "%s %s %s" % (str(obj.updated), str(obj.enacted), str(obj.backend_status))
+    if (obj.enacted is not None) and obj.enacted >= obj.updated:
+        return '<span style="min-width:16px;"><img src="/static/admin/img/icon_success.gif"></span>'
+    else:
+        if obj.backend_status == "Provisioning in progress" or obj.backend_status=="":
+            return '<span style="min-width:16px;" title="%s"><img src="/static/admin/img/icon_clock.gif"></span>' % obj.backend_status
         else:
-            return '<img src="/static/admin/img/icon_error.gif">'
+            return '<span style="min-width:16px;" title="%s"><img src="/static/admin/img/icon_error.gif"></span>' % obj.backend_status
+
+def backend_text(obj):
+    icon = backend_icon(obj)
+    if (obj.enacted is not None) and obj.enacted >= obj.updated:
+        return "%s %s" % (icon, "successfully enacted") # enacted on %s" % str(obj.enacted))
+    else:
+        return "%s %s" % (icon, obj.backend_status)
 
 class PlainTextWidget(forms.HiddenInput):
     input_type = 'hidden'
@@ -34,14 +43,6 @@ class PlainTextWidget(forms.HiddenInput):
             value = ''
         return mark_safe(str(value) + super(PlainTextWidget, self).render(name, value, attrs))
 
-class BackendStatusIconWidget(forms.Widget):
-    def render(self, name, value, attrs=None):
-        return mark_safe('<div title="%s">%s</div>' % (value, backend_icon(value)))
-
-class BackendStatusFullWidget(forms.Widget):
-    def render(self, name, value, attrs=None):
-        return mark_safe('%s %s' % (backend_icon(value), value))
-
 class ReadOnlyAwareAdmin(admin.ModelAdmin):
 
     def has_add_permission(self, request, obj=None):
@@ -95,22 +96,11 @@ class ReadOnlyAwareAdmin(admin.ModelAdmin):
     def __user_is_readonly(self, request):
         return request.user.isReadOnlyUser()
 
-    def formfield_for_dbfield(self, db_field, **kwargs):
-        if (db_field.name == 'backend_status'):
-            kwargs['widget'] = BackendStatusFullWidget(attrs={"title": "foo"})
-        result =  super(ReadOnlyAwareAdmin, self).formfield_for_dbfield(db_field, **kwargs)
-
-        if (db_field.name == 'backend_status'):
-            result.required = False
-
-        return result
+    def backend_status_text(self, obj):
+        return mark_safe(backend_text(obj))
 
     def backend_status_icon(self, obj):
-        if hasattr(obj, 'backend_status'):
-            value = obj.backend_status
-            return mark_safe('<div title="%s">%s</div>' % (value, backend_icon(value)))
-        else:
-            return ""
+        return mark_safe(backend_icon(obj))
     backend_status_icon.short_description = ""
 
 
@@ -204,17 +194,9 @@ class PlStackTabularInline(admin.TabularInline):
                     readonly_fields.append(field)
         return readonly_fields
 
-    def formfield_for_dbfield(self, db_field, **kwargs):
-        if (db_field.name == 'backend_status'):
-            kwargs['widget'] = BackendStatusIconWidget()
-
-        result = super(PlStackTabularInline, self).formfield_for_dbfield(db_field, **kwargs)
-
-        if (db_field.name == 'backend_status'):
-            result.label = ""
-            result.required = False
-
-        return result
+    def backend_status_icon(self, obj):
+        return mark_safe(backend_icon(obj))
+    backend_status_icon.short_description = ""
 
 class PlStackGenericTabularInline(generic.GenericTabularInline):
     def has_add_permission(self, request):
@@ -228,6 +210,10 @@ class PlStackGenericTabularInline(generic.GenericTabularInline):
                     readonly_fields.append(field)
         return readonly_fields
 
+    def backend_status_icon(self, obj):
+        return mark_safe(backend_icon(obj))
+    backend_status_icon.short_description = ""
+
 class ReservationInline(PlStackTabularInline):
     model = Reservation
     extra = 0
@@ -280,9 +266,9 @@ class NetworkLookerUpper:
 
 class SliverInline(PlStackTabularInline):
     model = Sliver
-    fields = ['backend_status', 'all_ips_string', 'instance_name', 'slice', 'numberCores', 'deploymentNetwork', 'image', 'node']
+    fields = ['backend_status_icon', 'all_ips_string', 'instance_name', 'slice', 'deploymentNetwork', 'flavor', 'image', 'node']
     extra = 0
-    readonly_fields = ['all_ips_string', 'instance_name']
+    readonly_fields = ['backend_status_icon', 'all_ips_string', 'instance_name']
     suit_classes = 'suit-tab suit-tab-slivers'
 
     def queryset(self, request):
@@ -291,53 +277,14 @@ class SliverInline(PlStackTabularInline):
     def formfield_for_foreignkey(self, db_field, request=None, **kwargs):
         if db_field.name == 'deploymentNetwork':
            kwargs['queryset'] = Deployment.select_by_acl(request.user)
-           # the inscrutable jquery selector below says:
-           #     find the closest parent "tr" to the current element
-           #     then find the child with class "field-node"
-           #     then find the child with that is a select
-           #     then return its id
-           kwargs['widget'] = forms.Select(attrs={'onChange': "update_nodes(this, $($(this).closest('tr')[0]).find('.field-node select')[0].id)"})
-           #kwargs['widget'] = forms.Select(attrs={'onChange': "console.log($($($(this).closest('tr')[0]).children('.field-node')[0]).children('select')[0].id);"})
+           kwargs['widget'] = forms.Select(attrs={'onChange': "sliver_deployment_changed(this);"})
+        elif db_field.name == 'flavor':
+           kwargs['widget'] = forms.Select(attrs={'onChange': "sliver_flavor_changed(this);"})
 
         field = super(SliverInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
 
         return field
 
-"""
-    SMBAKER: This is the old code that implemented each network type as a
-    separate column in the sliver table.
-
-    def _declared_fieldsets(self):
-        # Return None so django will call get_fieldsets and we can insert our
-        # dynamic fields
-        return None
-
-    def get_readonly_fields(self, request, obj=None):
-        readonly_fields = list(super(SliverInline, self).get_readonly_fields(request, obj))
-
-        # Lookup the networks that are bound to the slivers, and add those
-        # network names to the list of readonly fields.
-
-        for sliver in obj.slivers.all():
-            for nbs in sliver.networksliver_set.all():
-                if nbs.ip:
-                    network_name = nbs.network.name
-                    if network_name not in [str(x) for x in readonly_fields]:
-                        readonly_fields.append(NetworkLookerUpper.get(network_name))
-
-        return readonly_fields
-
-    def get_fieldsets(self, request, obj=None):
-        form = self.get_formset(request, obj).form
-        # fields = the read/write files + the read-only fields
-        fields = list(self.fields)
-        for fieldName in self.get_readonly_fields(request,obj):
-            if not fieldName in fields:
-                fields.append(fieldName)
-
-        return [(None, {'fields': fields})]
-"""
-
 class SiteInline(PlStackTabularInline):
     model = Site
     extra = 0
@@ -348,7 +295,8 @@ class SiteInline(PlStackTabularInline):
 
 class UserInline(PlStackTabularInline):
     model = User
-    fields = ['backend_status', 'email', 'firstname', 'lastname']
+    fields = ['backend_status_icon', 'email', 'firstname', 'lastname']
+    readonly_fields = ('backend_status_icon', )
     extra = 0
     suit_classes = 'suit-tab suit-tab-users'
 
@@ -357,7 +305,8 @@ class UserInline(PlStackTabularInline):
 
 class SliceInline(PlStackTabularInline):
     model = Slice
-    fields = ['backend_status', 'name', 'site', 'serviceClass', 'service']
+    fields = ['backend_status_icon', 'name', 'site', 'serviceClass', 'service']
+    readonly_fields = ('backend_status_icon', )
     extra = 0
     suit_classes = 'suit-tab suit-tab-slices'
 
@@ -368,13 +317,15 @@ class NodeInline(PlStackTabularInline):
     model = Node
     extra = 0
     suit_classes = 'suit-tab suit-tab-nodes'
-    fields = ['backend_status', 'name','deployment','site']
+    fields = ['backend_status_icon', 'name','deployment','site']
+    readonly_fields = ('backend_status_icon', )
 
 class DeploymentPrivilegeInline(PlStackTabularInline):
     model = DeploymentPrivilege
     extra = 0
     suit_classes = 'suit-tab suit-tab-deploymentprivileges'
-    fields = ['backend_status', 'user','role','deployment']
+    fields = ['backend_status_icon', 'user','role','deployment']
+    readonly_fields = ('backend_status_icon', )
 
     def queryset(self, request):
         return DeploymentPrivilege.select_by_user(request.user)
@@ -383,7 +334,8 @@ class SitePrivilegeInline(PlStackTabularInline):
     model = SitePrivilege
     extra = 0
     suit_classes = 'suit-tab suit-tab-siteprivileges'
-    fields = ['backend_status', 'user','site', 'role']
+    fields = ['backend_status_icon', 'user','site', 'role']
+    readonly_fields = ('backend_status_icon', )
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         if db_field.name == 'site':
@@ -400,7 +352,8 @@ class SiteDeploymentInline(PlStackTabularInline):
     model = SiteDeployments
     extra = 0
     suit_classes = 'suit-tab suit-tab-deployments'
-    fields = ['backend_status', 'deployment','site']
+    fields = ['backend_status_icon', 'deployment','site']
+    readonly_fields = ('backend_status_icon', )
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         if db_field.name == 'site':
@@ -418,7 +371,8 @@ class SlicePrivilegeInline(PlStackTabularInline):
     model = SlicePrivilege
     suit_classes = 'suit-tab suit-tab-sliceprivileges'
     extra = 0
-    fields = ('backend_status', 'user', 'slice', 'role')
+    fields = ('backend_status_icon', 'user', 'slice', 'role')
+    readonly_fields = ('backend_status_icon', )
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         if db_field.name == 'slice':
@@ -438,7 +392,8 @@ class SliceNetworkInline(PlStackTabularInline):
     verbose_name = "Network Connection"
     verbose_name_plural = "Network Connections"
     suit_classes = 'suit-tab suit-tab-slicenetworks'
-    fields = ['backend_status', 'network']
+    fields = ['backend_status_icon', 'network']
+    readonly_fields = ('backend_status_icon', )
 
 class ImageDeploymentsInline(PlStackTabularInline):
     model = ImageDeployments
@@ -446,8 +401,8 @@ class ImageDeploymentsInline(PlStackTabularInline):
     verbose_name = "Image Deployments"
     verbose_name_plural = "Image Deployments"
     suit_classes = 'suit-tab suit-tab-imagedeployments'
-    fields = ['backend_status', 'image', 'deployment', 'glance_image_id']
-    readonly_fields = ['glance_image_id']
+    fields = ['backend_status_icon', 'image', 'deployment', 'glance_image_id']
+    readonly_fields = ['backend_status_icon', 'glance_image_id']
 
 class PlanetStackBaseAdmin(ReadOnlyAwareAdmin):
     save_on_top = False
@@ -464,6 +419,24 @@ class PlanetStackBaseAdmin(ReadOnlyAwareAdmin):
         instances = formset.save(commit=False)
         for instance in instances:
             instance.save_by_user(request.user)
+
+        # BUG in django 1.7? Objects are not deleted by formset.save if
+        # commit is False. So let's delete them ourselves.
+        #
+        # code from forms/models.py save_existing_objects()
+        try:
+            forms_to_delete = formset.deleted_forms\r
+        except AttributeError:\r
+            forms_to_delete = []
+        if formset.initial_forms:
+            for form in formset.initial_forms:
+                obj = form.instance
+                if form in forms_to_delete:
+                    if obj.pk is None:
+                        continue
+                    formset.deleted_objects.append(obj)
+                    obj.delete()
+
         formset.save_m2m()
 
 class SliceRoleAdmin(PlanetStackBaseAdmin):
@@ -491,8 +464,17 @@ class DeploymentAdminForm(forms.ModelForm):
             verbose_name=('Images'), is_stacked=False
         )
     )
+    flavors = forms.ModelMultipleChoiceField(
+        queryset=Flavor.objects.all(),
+        required=False,
+        help_text="Select which flavors should be usable on this deployment",
+        widget=FilteredSelectMultiple(
+            verbose_name=('Flavors'), is_stacked=False
+        )
+    )
     class Meta:
         model = Deployment
+        many_to_many = ["flavors",]
 
     def __init__(self, *args, **kwargs):
       request = kwargs.pop('request', None)
@@ -503,6 +485,7 @@ class DeploymentAdminForm(forms.ModelForm):
       if self.instance and self.instance.pk:
         self.fields['sites'].initial = [x.site for x in self.instance.sitedeployments_set.all()]
         self.fields['images'].initial = [x.image for x in self.instance.imagedeployments_set.all()]
+        self.fields['flavors'].initial = self.instance.flavors.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
@@ -542,6 +525,8 @@ class DeploymentAdminForm(forms.ModelForm):
     def save(self, commit=True):
       deployment = super(DeploymentAdminForm, self).save(commit=False)
 
+      deployment.flavors = self.cleaned_data['flavors']
+
       if commit:
         deployment.save()
 
@@ -553,7 +538,7 @@ class DeploymentAdminForm(forms.ModelForm):
         self.manipulate_m2m_objs(deployment, self.cleaned_data['sites'], deployment.sitedeployments_set.all(), SiteDeployments, "deployment", "site")
         self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments_set.all(), ImageDeployments, "deployment", "image")
 
-        self.save_m2m()
+      self.save_m2m()
 
       return deployment
 
@@ -568,11 +553,12 @@ class SiteAssocInline(PlStackTabularInline):
 
 class DeploymentAdmin(PlanetStackBaseAdmin):
     model = Deployment
-    fieldList = ['backend_status', 'name', 'sites', 'images', 'accessControl']
+    fieldList = ['backend_status_text', 'name', 'availability_zone', 'sites', 'images', 'flavors', 'accessControl']
     fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-sites']})]
     inlines = [DeploymentPrivilegeInline,NodeInline,TagInline] # ,ImageDeploymentsInline]
     list_display = ['backend_status_icon', 'name']
     list_display_links = ('backend_status_icon', 'name', )
+    readonly_fields = ('backend_status_text', )
 
     user_readonly_fields = ['name']
 
@@ -603,9 +589,10 @@ class ServiceAttrAsTabInline(PlStackTabularInline):
 class ServiceAdmin(PlanetStackBaseAdmin):
     list_display = ("backend_status_icon","name","description","versionNumber","enabled","published")
     list_display_links = ('backend_status_icon', 'name', )
-    fieldList = ["backend_status","name","description","versionNumber","enabled","published"]
+    fieldList = ["backend_status_text","name","description","versionNumber","enabled","published"]
     fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-general']})]
     inlines = [ServiceAttrAsTabInline,SliceInline]
+    readonly_fields = ('backend_status_text', )
 
     user_readonly_fields = fieldList
 
@@ -615,7 +602,7 @@ class ServiceAdmin(PlanetStackBaseAdmin):
     )
 
 class SiteAdmin(PlanetStackBaseAdmin):
-    fieldList = ['backend_status', 'name', 'site_url', 'enabled', 'is_public', 'login_base', 'accountLink','location']
+    fieldList = ['backend_status_text', 'name', 'site_url', 'enabled', 'is_public', 'login_base', 'accountLink','location']
     fieldsets = [
         (None, {'fields': fieldList, 'classes':['suit-tab suit-tab-general']}),
         #('Deployment Networks', {'fields': ['deployments'], 'classes':['suit-tab suit-tab-deployments']}),
@@ -628,7 +615,7 @@ class SiteAdmin(PlanetStackBaseAdmin):
         ('nodes','Nodes'),
         ('tags','Tags'),
     )
-    readonly_fields = ['accountLink']
+    readonly_fields = ['backend_status_text', 'accountLink']
 
     user_readonly_fields = ['name', 'deployments','site_url', 'enabled', 'is_public', 'login_base', 'accountLink']
 
@@ -679,10 +666,11 @@ class SiteAdmin(PlanetStackBaseAdmin):
         
 
 class SitePrivilegeAdmin(PlanetStackBaseAdmin):
-    fieldList = ['backend_status', 'user', 'site', 'role']
+    fieldList = ['backend_status_text', 'user', 'site', 'role']
     fieldsets = [
         (None, {'fields': fieldList, 'classes':['collapse']})
     ]
+    readonly_fields = ('backend_status_text', )
     list_display = ('backend_status_icon', 'user', 'site', 'role')
     list_display_links = list_display
     user_readonly_fields = fieldList
@@ -730,10 +718,20 @@ class SliceForm(forms.ModelForm):
             'service': LinkedSelect
         }
 
+    def clean(self):
+        cleaned_data = super(SliceForm, self).clean()
+        name = cleaned_data.get('name')
+        site_id = cleaned_data.get('site')
+        site = Slice.objects.get(id=site_id)
+        if not name.startswith(site.login_base):
+            raise forms.ValidationError('slice name must begin with %s' % site.login_base)
+        return cleaned_data
+
 class SliceAdmin(PlanetStackBaseAdmin):
     form = SliceForm
-    fieldList = ['backend_status', 'name', 'site', 'serviceClass', 'enabled','description', 'service', 'slice_url', 'max_slivers']
+    fieldList = ['backend_status_text', 'site', 'name', 'serviceClass', 'enabled','description', 'service', 'slice_url', 'max_slivers']
     fieldsets = [('Slice Details', {'fields': fieldList, 'classes':['suit-tab suit-tab-general']}),]
+    readonly_fields = ('backend_status_text', )
     list_display = ('backend_status_icon', 'name', 'site','serviceClass', 'slice_url', 'max_slivers')
     list_display_links = ('backend_status_icon', 'name', )
     inlines = [SlicePrivilegeInline,SliverInline, TagInline, ReservationInline,SliceNetworkInline]
@@ -749,22 +747,35 @@ 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[node.deployment.id] = get(deployment_nodes, node.deployment.id, []).append( (node.id, node.name) )
-
         deployment_nodes = []
         for node in Node.objects.all():
             deployment_nodes.append( (node.deployment.id, node.id, node.name) )
 
-        context["deployment_nodes"] = deployment_nodes
+        deployment_flavors = []
+        for flavor in Flavor.objects.all():
+            for deployment in flavor.deployments.all():
+                deployment_flavors.append( (deployment.id, flavor.id, flavor.name) )
 
+        deployment_images = []
+        for image in Image.objects.all():
+            for imageDeployment in image.imagedeployments_set.all():
+                deployment_images.append( (imageDeployment.deployment.id, image.id, image.name) )
+
+        site_login_bases = []
+        for site in Site.objects.all():
+            site_login_bases.append((site.id, site.login_base))
+
+        context["deployment_nodes"] = deployment_nodes
+        context["deployment_flavors"] = deployment_flavors
+        context["deployment_images"] = deployment_images
+        context["site_login_bases"] = site_login_bases
         return super(SliceAdmin, self).render_change_form(request, context, add, change, form_url, obj)
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         if db_field.name == 'site':
             kwargs['queryset'] = Site.select_by_user(request.user)
-                
+            kwargs['widget'] = forms.Select(attrs={'onChange': "update_slice_prefix(this, $($(this).closest('fieldset')[0]).find('.field-name input')[0].id)"})
+
         return super(SliceAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
 
     def queryset(self, request):
@@ -783,8 +794,9 @@ class SliceAdmin(PlanetStackBaseAdmin):
 
 class SlicePrivilegeAdmin(PlanetStackBaseAdmin):
     fieldsets = [
-        (None, {'fields': ['backend_status', 'user', 'slice', 'role']})
+        (None, {'fields': ['backend_status_text', 'user', 'slice', 'role']})
     ]
+    readonly_fields = ('backend_status_text', )
     list_display = ('backend_status_icon', 'user', 'slice', 'role')
     list_display_links = list_display
 
@@ -823,9 +835,10 @@ class SlicePrivilegeAdmin(PlanetStackBaseAdmin):
 class ImageAdmin(PlanetStackBaseAdmin):
 
     fieldsets = [('Image Details',
-                   {'fields': ['backend_status', 'name', 'disk_format', 'container_format'],
+                   {'fields': ['backend_status_text', 'name', 'disk_format', 'container_format'],
                     'classes': ['suit-tab suit-tab-general']})
                ]
+    readonly_fields = ('backend_status_text', )
 
     suit_form_tabs =(('general','Image Details'),('slivers','Slivers'),('imagedeployments','Deployments'))
 
@@ -850,7 +863,8 @@ class NodeAdmin(PlanetStackBaseAdmin):
     list_filter = ('deployment',)
 
     inlines = [TagInline,SliverInline]
-    fieldsets = [('Node Details', {'fields': ['backend_status', 'name','site','deployment'], 'classes':['suit-tab suit-tab-details']})]
+    fieldsets = [('Node Details', {'fields': ['backend_status_text', 'name','site','deployment'], 'classes':['suit-tab suit-tab-details']})]
+    readonly_fields = ('backend_status_text', )
 
     user_readonly_fields = ['name','site','deployment']
     user_readonly_inlines = [TagInline,SliverInline]
@@ -881,9 +895,10 @@ class TagAdmin(PlanetStackBaseAdmin):
 class SliverAdmin(PlanetStackBaseAdmin):
     form = SliverForm
     fieldsets = [
-        ('Sliver Details', {'fields': ['backend_status', 'slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'numberCores', 'image', ], 'classes': ['suit-tab suit-tab-general'], })
+        ('Sliver Details', {'fields': ['backend_status_text', 'slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'flavor', 'image', ], 'classes': ['suit-tab suit-tab-general'], })
     ]
-    list_display = ['backend_status_icon', 'ip', 'instance_name', 'slice', 'numberCores', 'image', 'node', 'deploymentNetwork']
+    readonly_fields = ('backend_status_text', )
+    list_display = ['backend_status_icon', 'ip', 'instance_name', 'slice', 'flavor', 'image', 'node', 'deploymentNetwork']
     list_display_links = ('backend_status_icon', 'ip',)
 
     suit_form_tabs =(('general', 'Sliver Details'),
@@ -892,7 +907,7 @@ class SliverAdmin(PlanetStackBaseAdmin):
 
     inlines = [TagInline]
 
-    user_readonly_fields = ['slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'numberCores', 'image']
+    user_readonly_fields = ['slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'flavor', 'image']
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         if db_field.name == 'slice':
@@ -910,9 +925,9 @@ class SliverAdmin(PlanetStackBaseAdmin):
         # make some fields read only if we are updating an existing record
         if obj == None:
             #self.readonly_fields = ('ip', 'instance_name')
-            self.readonly_fields = ()
+            self.readonly_fields = ('backend_status_text')
         else:
-            self.readonly_fields = ()
+            self.readonly_fields = ('backend_status_text')
             #self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key')
 
         for inline in self.get_inline_instances(request, obj):
@@ -1008,7 +1023,7 @@ class UserAdmin(UserAdmin):
     fieldListContactInfo = ['firstname','lastname','phone','timezone']
 
     fieldsets = (
-        ('Login Details', {'fields': ['backend_status', 'email', 'site','password', 'is_active', 'is_readonly', 'is_admin', 'public_key'], 'classes':['suit-tab suit-tab-general']}),
+        ('Login Details', {'fields': ['backend_status_text', 'email', 'site','password', 'is_active', 'is_readonly', 'is_admin', 'public_key'], 'classes':['suit-tab suit-tab-general']}),
         ('Contact Information', {'fields': ('firstname','lastname','phone', 'timezone'), 'classes':['suit-tab suit-tab-contact']}),
         #('Dashboard Views', {'fields': ('dashboards',), 'classes':['suit-tab suit-tab-dashboards']}),
         #('Important dates', {'fields': ('last_login',)}),
@@ -1019,6 +1034,7 @@ class UserAdmin(UserAdmin):
             'fields': ('email', 'firstname', 'lastname', 'is_readonly', 'phone', 'public_key','password1', 'password2')}
         ),
     )
+    readonly_fields = ('backend_status_text', )
     search_fields = ('email',)
     ordering = ('email',)
     filter_horizontal = ()
@@ -1087,21 +1103,19 @@ class UserAdmin(UserAdmin):
     def queryset(self, request):
         return User.select_by_user(request.user)
 
-    def formfield_for_dbfield(self, db_field, **kwargs):
-        if (db_field.name == 'backend_status'):
-            kwargs['widget'] = BackendStatusFullWidget(attrs={"title": "foo"})
-        result =  super(UserAdmin, self).formfield_for_dbfield(db_field, **kwargs)
+    def backend_status_text(self, obj):
+        return mark_safe(backend_text(obj))
 
-        if (db_field.name == 'backend_status'):
-            result.required = False
-
-        return result
+    def backend_status_icon(self, obj):
+        return mark_safe(backend_icon(obj))
+    backend_status_icon.short_description = ""
 
 class DashboardViewAdmin(PlanetStackBaseAdmin):
     fieldsets = [('Dashboard View Details',
-                   {'fields': ['backend_status', 'name', 'url'],
+                   {'fields': ['backend_status_text', 'name', 'url'],
                     'classes': ['suit-tab suit-tab-general']})
                ]
+    readonly_fields = ('backend_status_text', )
 
     suit_form_tabs =(('general','Dashboard View Details'),)
 
@@ -1197,8 +1211,9 @@ class ReservationAddRefreshForm(ReservationAddForm):
         return False
 
 class ReservationAdmin(PlanetStackBaseAdmin):
-    fieldList = ['backend_status', 'slice', 'startTime', 'duration']
+    fieldList = ['backend_status_text', 'slice', 'startTime', 'duration']
     fieldsets = [('Reservation Details', {'fields': fieldList, 'classes': ['suit-tab suit-tab-general']})]
+    readonly_fields = ('backend_status_text', )
     list_display = ('startTime', 'duration')
     form = ReservationAddForm
 
@@ -1281,11 +1296,12 @@ class NetworkParameterInline(PlStackGenericTabularInline):
     verbose_name_plural = "Parameters"
     verbose_name = "Parameter"
     suit_classes = 'suit-tab suit-tab-netparams'
-    fields = ['backend_status', 'parameter', 'value']
+    fields = ['backend_status_icon', 'parameter', 'value']
+    readonly_fields = ('backend_status_icon', )
 
 class NetworkSliversInline(PlStackTabularInline):
-    fields = ['backend_status', 'network','sliver','ip']
-    readonly_fields = ("ip", )
+    fields = ['backend_status_icon', 'network','sliver','ip']
+    readonly_fields = ("backend_status_icon", "ip", )
     model = NetworkSliver
     selflink_fieldname = "sliver"
     extra = 0
@@ -1300,7 +1316,8 @@ class NetworkSlicesInline(PlStackTabularInline):
     verbose_name_plural = "Slices"
     verbose_name = "Slice"
     suit_classes = 'suit-tab suit-tab-networkslices'
-    fields = ['backend_status', 'network','slice']
+    fields = ['backend_status_icon', 'network','slice']
+    readonly_fields = ('backend_status_icon', )
 
 class NetworkAdmin(PlanetStackBaseAdmin):
     list_display = ("backend_status_icon", "name", "subnet", "ports", "labels")
@@ -1310,8 +1327,9 @@ class NetworkAdmin(PlanetStackBaseAdmin):
     inlines = [NetworkParameterInline, NetworkSliversInline, NetworkSlicesInline, RouterInline]
 
     fieldsets = [
-        (None, {'fields': ['backend_status', 'name','template','ports','labels','owner','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet'], 'classes':['suit-tab suit-tab-general']}),]
+        (None, {'fields': ['backend_status_text', 'name','template','ports','labels','owner','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet'], 'classes':['suit-tab suit-tab-general']}),]
 
+    readonly_fields = ('backend_status_text', )
     user_readonly_fields = ['name','template','ports','labels','owner','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet']
 
     suit_form_tabs =(
@@ -1327,6 +1345,12 @@ class NetworkTemplateAdmin(PlanetStackBaseAdmin):
     user_readonly_fields = ["name", "guaranteedBandwidth", "visibility"]
     user_readonly_inlines = []
 
+class FlavorAdmin(PlanetStackBaseAdmin):
+    list_display = ("backend_status_icon", "name", "flavor", "order", "default")
+    list_display_links = ("backend_status_icon", "name")
+    user_readonly_fields = ("name", "flavor")
+    fields = ("name", "description", "flavor", "order", "default")
+
 # 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'],
@@ -1445,7 +1469,6 @@ class AccountAdmin(admin.ModelAdmin):
     dollar_total_invoices = dollar_field("total_invoices", "Total Invoices")
     dollar_total_payments = dollar_field("total_payments", "Total Payments")
 
-
 # Now register the new UserAdmin...
 admin.site.register(User, UserAdmin)
 # ... and, since we're not using Django's builtin permissions,
@@ -1488,4 +1511,5 @@ if True:
     admin.site.register(Sliver, SliverAdmin)
     admin.site.register(Image, ImageAdmin)
     admin.site.register(DashboardView, DashboardViewAdmin)
+    admin.site.register(Flavor, FlavorAdmin)