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=="":
+ if ((obj.backend_status is not None) and obj.backend_status.startswith("0 -")) or 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 '<span style="min-width:16px;" title="%s"><img src="/static/admin/img/icon_error.gif"></span>' % html_escape(obj.backend_status, quote=True)
suit_classes = 'suit-tab suit-tab-nodes'
class SiteAdmin(PlanetStackBaseAdmin):
- fieldList = ['backend_status_text', 'name', 'site_url', 'enabled', 'is_public', 'login_base', 'accountLink','location']
+ #fieldList = ['backend_status_text', 'name', 'site_url', 'enabled', 'is_public', 'login_base', 'accountLink','location']
+ fieldList = ['backend_status_text', 'name', 'site_url', 'enabled', 'is_public', 'login_base', 'location']
fieldsets = [
(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-general']}),
#('Deployment Networks', {'fields': ['deployments'], 'classes':['suit-tab suit-tab-deployments']}),
]
- readonly_fields = ['backend_status_text', 'accountLink']
+ #readonly_fields = ['backend_status_text', 'accountLink']
+ readonly_fields = ['backend_status_text']
- user_readonly_fields = ['name', 'deployments','site_url', 'enabled', 'is_public', 'login_base', 'accountLink']
+ #user_readonly_fields = ['name', 'deployments','site_url', 'enabled', 'is_public', 'login_base', 'accountLink']
+ user_readonly_fields = ['name', 'deployments','site_url', 'enabled', 'is_public', 'login_base']
list_display = ('backend_status_icon', 'name', 'login_base','site_url', 'enabled')
list_display_links = ('backend_status_icon', 'name', )
('slicenetworks','Networks'),
('sliceprivileges','Privileges'),
('slivers','Slivers'),
- ('reservations','Reservations'),
+ #('reservations','Reservations'),
('tags','Tags'),
]
# 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', 'firstname', 'lastname', 'site', 'last_login')
+ list_display = ('backend_status_icon', 'email', 'firstname', 'lastname', 'site', 'last_login')
+ list_display_links = ("email",)
list_filter = ('site',)
inlines = [SlicePrivilegeInline,SitePrivilegeInline,UserDashboardViewInline]
admin_inlines = [ControllerUserInline]
add_fieldsets = (
(None, {
'classes': ('wide',),
- 'fields': ('site', 'email', 'firstname', 'lastname', 'is_readonly', 'phone', 'public_key','password1', 'password2')},
+ 'fields': ('site', 'email', 'firstname', 'lastname', 'is_admin','is_admin', 'is_readonly', 'phone', 'public_key','password1', 'password2')},
),
)
readonly_fields = ('backend_status_text', )
def queryset(self, request):
return User.select_by_user(request.user)
+ def get_form(self, request, obj=None, **kwargs):
+ if not request.user.is_admin:
+ self.fieldsets = (
+ ('Login Details', {'fields': ['backend_status_text', 'email', 'site','password','public_key'], 'classes':['suit-tab suit-tab-general']}),
+ ('Contact Information', {'fields': ('firstname','lastname','phone', 'timezone'), 'classes':['suit-tab suit-tab-contact']}),
+ )
+ self.readonly_fields = ('backend_status_text', 'site')
+ return super(UserAdmin, self).get_form(request, obj, **kwargs)
+
class ControllerDashboardViewInline(PlStackTabularInline):
model = ControllerDashboardView
extra = 0
admin.site.register(Site, SiteAdmin)
admin.site.register(Slice, SliceAdmin)
admin.site.register(Service, ServiceAdmin)
-admin.site.register(Reservation, ReservationAdmin)
+#admin.site.register(Reservation, ReservationAdmin)
admin.site.register(Network, NetworkAdmin)
admin.site.register(Router, RouterAdmin)
admin.site.register(NetworkTemplate, NetworkTemplateAdmin)
-admin.site.register(Account, AccountAdmin)
-admin.site.register(Invoice, InvoiceAdmin)
+#admin.site.register(Account, AccountAdmin)
+#admin.site.register(Invoice, InvoiceAdmin)
if True:
admin.site.register(NetworkParameterType, NetworkParameterTypeAdmin)