From: Tony Mack Date: Wed, 17 Apr 2013 02:48:40 +0000 (-0400) Subject: add pain text ip address field to Sliver form X-Git-Tag: 1.0~98 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d90cdbf57462bac32cf35e5ff401b5d560851d78;p=plstackapi.git add pain text ip address field to Sliver form --- diff --git a/plstackapi/core/admin.py b/plstackapi/core/admin.py index 7b6827a..8ee3e1c 100644 --- a/plstackapi/core/admin.py +++ b/plstackapi/core/admin.py @@ -2,7 +2,7 @@ from plstackapi.core.models import Site from plstackapi.core.models import * from django.contrib import admin from django import forms - +from django.utils.safestring import mark_safe from django.contrib.auth.admin import UserAdmin from django.contrib.admin.widgets import FilteredSelectMultiple @@ -125,11 +125,24 @@ class RoleAdmin(admin.ModelAdmin): ] list_display = ('role_type',) +class PlainTextWidget(forms.Widget): + def render(self, _name, value, attrs): + return mark_safe(value) if value is not None else '' + +class SliverForm(forms.ModelForm): + class Meta: + ip = forms.CharField(widget=PlainTextWidget) + model = Sliver + widgets = { + 'ip': PlainTextWidget(), + } + class SliverAdmin(admin.ModelAdmin): + form = SliverForm fieldsets = [ - ('Sliver', {'fields': ['name', 'slice', 'flavor', 'image', 'key', 'node', 'deploymentNetwork']}) + ('Sliver', {'fields': ['ip', 'name', 'slice', 'flavor', 'image', 'key', 'node', 'deploymentNetwork']}) ] - list_display = ['name', 'slice', 'flavor', 'image', 'key', 'node', 'deploymentNetwork'] + list_display = ['ip', 'name', 'slice', 'flavor', 'image', 'key', 'node', 'deploymentNetwork'] admin.site.register(Site, SiteAdmin) admin.site.register(SitePrivilege) diff --git a/plstackapi/core/serializers.py b/plstackapi/core/serializers.py index 5e077dc..2b70357 100644 --- a/plstackapi/core/serializers.py +++ b/plstackapi/core/serializers.py @@ -166,6 +166,7 @@ class SliverSerializer(serializers.HyperlinkedModelSerializer): fields = ('id', 'instance_id', 'name', + 'ip', 'flavor', 'image', 'key',