From b2fd3fca33fa3f4a224f12b153bbf3fca69f0b49 Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Tue, 9 Sep 2014 10:38:15 -0700 Subject: [PATCH] prevent backend-status icon from disappearing --- planetstack/core/admin.py | 41 +++------------------------------------ 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py index 3e57ee0..1d64d9c 100644 --- a/planetstack/core/admin.py +++ b/planetstack/core/admin.py @@ -21,12 +21,12 @@ import django_evolution 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 '' + return '' else: if obj.backend_status == "Provisioning in progress" or obj.backend_status=="": - return '' % obj.backend_status + return '' % obj.backend_status else: - return '' % obj.backend_status + return '' % obj.backend_status def backend_text(obj): icon = backend_icon(obj) @@ -285,41 +285,6 @@ class SliverInline(PlStackTabularInline): 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 -- 2.43.0