X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=planetstack%2Fcore%2Fadmin.py;h=1d64d9c1ad86473c0117ab87449b04697a59060c;hb=97b2edbd635eaec01e33030b18e7ce2ca96c530f;hp=3e57ee0450b1527140e7f8b51d63efebfbf4bcdf;hpb=526c57c1de53a5f1003cfa3a0866b07283acd50e;p=plstackapi.git
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